Skip to contentSkip to conversation

fm10k: remove CONFIG_FM10K_VXLAN in favor of CONFIG_VXLAN

PATCH New Jacob Keller 2 participants 2 messages Nov 6, 2015

Subsystems (2)
Network drivers Intel Ethernet
lore
Share & tools
lore

Jacob Keller

author
#0 lore raw

PATCH 1/1 fm10k: remove CONFIG_FM10K_VXLAN in favor of CONFIG_VXLAN

There isn't a really compelling reason to keep CONFIG_FM10K_VXLAN around when we could just check against CONFIG_VXLAN directly.

Signed-off-by Jacob Keller <[email protected]>
---
 drivers/net/ethernet/intel/Kconfig              | 11 -----------
 drivers/net/ethernet/intel/fm10k/fm10k_netdev.c |  8 ++++----
 2 files changed, 4 insertions(+), 15 deletions(-)
drivers/net/ethernet/intel/Kconfig +0 -11
index 4163b16489b3..c69e4d241dd0 100644
@@ -340,15 +340,4 @@ config FM10K
 	  To compile this driver as a module, choose M here. The module
 	  will be called fm10k.  MSI-X interrupt support is required
 
-config FM10K_VXLAN
-	bool "Virtual eXtensible Local Area Network Support"
-	default n
-	depends on FM10K && VXLAN && !(FM10K=y && VXLAN=m)
-	---help---
-	  This allows one to create VXLAN virtual interfaces that provide
-	  Layer 2 Networks over Layer 3 Networks. VXLAN is often used
-	  to tunnel virtual network infrastructure in virtualized environments.
-	  Say Y here if you want to use Virtual eXtensible Local Area Network
-	  (VXLAN) in the driver.
-
 endif # NET_VENDOR_INTEL
drivers/net/ethernet/intel/fm10k/fm10k_netdev.c +4 -4
index 722ac52d9c96..7ab0e449a586 100644
@@ -20,9 +20,9 @@
 
 #include "fm10k.h"
 #include <linux/vmalloc.h>
-#if IS_ENABLED(CONFIG_FM10K_VXLAN)
+#if IS_ENABLED(CONFIG_VXLAN)
 #include <net/vxlan.h>
-#endif /* CONFIG_FM10K_VXLAN */
+#endif /* CONFIG_VXLAN */
 
 /**
  * fm10k_setup_tx_resources - allocate Tx resources (Descriptors)

@@ -556,11 +556,11 @@ int fm10k_open(struct net_device *netdev)
 	if (err)
 		goto err_set_queues;
 
-#if IS_ENABLED(CONFIG_FM10K_VXLAN)
+#if IS_ENABLED(CONFIG_VXLAN)
 	/* update VXLAN port configuration */
 	vxlan_get_rx_port(netdev);
+#endif /* CONFIG_VXLAN */
 
-#endif
 	fm10k_up(interface);
 
 	return 0;
Signature · 1 line
2.6.1.264.gbab76a9
#1 lore raw

PATCH 1/1 fm10k: remove CONFIG_FM10K_VXLAN in favor of CONFIG_VXLAN

Ignore this patch for now, it's not quite right.

Regards,
Jake

Quoted 67 lines · Jacob Keller

There isn't a really compelling reason to keep CONFIG_FM10K_VXLAN around
when we could just check against CONFIG_VXLAN directly.

Signed-off-by Jacob Keller <[email protected]>

---
?drivers/net/ethernet/intel/Kconfig??????????????| 11 ----------- ?drivers/net/ethernet/intel/fm10k/fm10k_netdev.c |??8 ++++---- ?2 files changed, 4 insertions(+), 15 deletions(-)

drivers/net/ethernet/intel/Kconfig +0 -0
index 4163b16489b3..c69e4d241dd0 100644
@@ -340,15 +340,4 @@ config FM10K

? ??To compile this driver as a module, choose M here. The
module
? ??will be called fm10k.??MSI-X interrupt support is required
?

drivers/net/ethernet/intel/Kconfig +0 -6
-config FM10K_VXLAN
-	bool "Virtual eXtensible Local Area Network Support"
-	default n
-	depends on FM10K && VXLAN && !(FM10K=y && VXLAN=m)
-	---help---
-	??This allows one to create VXLAN virtual interfaces that

provide

drivers/net/ethernet/intel/Kconfig +0 -1
-	??Layer 2 Networks over Layer 3 Networks. VXLAN is often

used

drivers/net/ethernet/intel/Kconfig +0 -1
-	??to tunnel virtual network infrastructure in virtualized

environments.

drivers/net/ethernet/intel/Kconfig +0 -1
-	??Say Y here if you want to use Virtual eXtensible Local

Area Network

drivers/net/ethernet/intel/Kconfig +0 -2
-	??(VXLAN) in the driver.
-

?endif # NET_VENDOR_INTEL

drivers/net/ethernet/intel/fm10k/fm10k_netdev.c +0 -0
index 722ac52d9c96..7ab0e449a586 100644
@@ -20,9 +20,9 @@

?
?#include "fm10k.h"
?#include <linux/vmalloc.h>

drivers/net/ethernet/intel/fm10k/fm10k_netdev.c +1 -1
-#if IS_ENABLED(CONFIG_FM10K_VXLAN)
+#if IS_ENABLED(CONFIG_VXLAN)

?#include <net/vxlan.h>

drivers/net/ethernet/intel/fm10k/fm10k_netdev.c +1 -1
-#endif /* CONFIG_FM10K_VXLAN */
+#endif /* CONFIG_VXLAN */

?
?/**
? * fm10k_setup_tx_resources - allocate Tx resources (Descriptors)

drivers/net/ethernet/intel/fm10k/fm10k_netdev.c +0 -0
@@ -556,11 +556,11 @@ int fm10k_open(struct net_device *netdev)
 ?	if (err)
 ?		goto err_set_queues;

?

drivers/net/ethernet/intel/fm10k/fm10k_netdev.c +1 -1
-#if IS_ENABLED(CONFIG_FM10K_VXLAN)
+#if IS_ENABLED(CONFIG_VXLAN)

? /* update VXLAN port configuration */
? vxlan_get_rx_port(netdev);
+#endif /* CONFIG_VXLAN */
?
-#endif
? fm10k_up(interface);
?
? return 0;