[net-next] fm10k: Add CONFIG_FM10K_VXLAN configuration option

[net-next] fm10k: Add CONFIG_FM10K_VXLAN configuration option

[Andy Zhou]

Compiling with CONFIG_FM10K=y and VXLAN=m resulting in linking error:

   drivers/built-in.o: In function `fm10k_open':
   (.text+0x1f9d7a): undefined reference to `vxlan_get_rx_port'
   make: *** [vmlinux] Error 1

The fix follows the same strategy as I40E.

Signed-off-by: Andy Zhou <azhou@nicira.com>
---
 drivers/net/ethernet/intel/Kconfig              | 11 +++++++++++
 drivers/net/ethernet/intel/fm10k/fm10k_netdev.c |  6 +++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/intel/Kconfig b/drivers/net/ethernet/intel/Kconfig
index 6a6d5ee..3308881 100644
--- a/drivers/net/ethernet/intel/Kconfig
+++ b/drivers/net/ethernet/intel/Kconfig
@@ -319,4 +319,15 @@ 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
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
index dcec000..9d46333 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c
@@ -20,9 +20,9 @@
 
 #include "fm10k.h"
 #include <linux/vmalloc.h>
-#if IS_ENABLED(CONFIG_VXLAN)
+#if IS_ENABLED(CONFIG_FM10K_VXLAN)
 #include <net/vxlan.h>
-#endif /* CONFIG_VXLAN */
+#endif /* CONFIG_FM10K_VXLAN */
 
 /**
  * fm10k_setup_tx_resources - allocate Tx resources (Descriptors)
@@ -552,7 +552,7 @@ int fm10k_open(struct net_device *netdev)
 	if (err)
 		goto err_set_queues;
 
-#if IS_ENABLED(CONFIG_VXLAN)
+#if IS_ENABLED(CONFIG_FM10K_VXLAN)
 	/* update VXLAN port configuration */
 	vxlan_get_rx_port(netdev);
 
-- 
1.9.1

Re: [net-next] fm10k: Add CONFIG_FM10K_VXLAN configuration option

[Alexander Duyck]

On 10/03/2014 02:05 PM, Andy Zhou wrote:
> Compiling with CONFIG_FM10K=y and VXLAN=m resulting in linking error:
> 
>    drivers/built-in.o: In function `fm10k_open':
>    (.text+0x1f9d7a): undefined reference to `vxlan_get_rx_port'
>    make: *** [vmlinux] Error 1
> 
> The fix follows the same strategy as I40E.
> 
> Signed-off-by: Andy Zhou <azhou@nicira.com>
> ---
>  drivers/net/ethernet/intel/Kconfig              | 11 +++++++++++
>  drivers/net/ethernet/intel/fm10k/fm10k_netdev.c |  6 +++---
>  2 files changed, 14 insertions(+), 3 deletions(-)

Looks good to me.  Thanks for resolving this.

Acked-by: Alexander Duyck <alexander.h.duyck@intel.com>

Re: [net-next] fm10k: Add CONFIG_FM10K_VXLAN configuration option

[David Miller]

From: Alexander Duyck <alexander.h.duyck@intel.com>
Date: Fri, 03 Oct 2014 14:40:07 -0700

> On 10/03/2014 02:05 PM, Andy Zhou wrote:
>> Compiling with CONFIG_FM10K=y and VXLAN=m resulting in linking error:
>> 
>>    drivers/built-in.o: In function `fm10k_open':
>>    (.text+0x1f9d7a): undefined reference to `vxlan_get_rx_port'
>>    make: *** [vmlinux] Error 1
>> 
>> The fix follows the same strategy as I40E.
>> 
>> Signed-off-by: Andy Zhou <azhou@nicira.com>
>> ---
>>  drivers/net/ethernet/intel/Kconfig              | 11 +++++++++++
>>  drivers/net/ethernet/intel/fm10k/fm10k_netdev.c |  6 +++---
>>  2 files changed, 14 insertions(+), 3 deletions(-)
> 
> Looks good to me.  Thanks for resolving this.
> 
> Acked-by: Alexander Duyck <alexander.h.duyck@intel.com>

I expect this will go via Jeff Kirsher, CC:'d.

Re: [net-next] fm10k: Add CONFIG_FM10K_VXLAN configuration option

[Jeff Kirsher]

[-- Attachment #1: Type: text/plain, Size: 989 bytes --]

On Fri, 2014-10-03 at 15:01 -0700, David Miller wrote:
> From: Alexander Duyck <alexander.h.duyck@intel.com>
> Date: Fri, 03 Oct 2014 14:40:07 -0700
> 
> > On 10/03/2014 02:05 PM, Andy Zhou wrote:
> >> Compiling with CONFIG_FM10K=y and VXLAN=m resulting in linking error:
> >> 
> >>    drivers/built-in.o: In function `fm10k_open':
> >>    (.text+0x1f9d7a): undefined reference to `vxlan_get_rx_port'
> >>    make: *** [vmlinux] Error 1
> >> 
> >> The fix follows the same strategy as I40E.
> >> 
> >> Signed-off-by: Andy Zhou <azhou@nicira.com>
> >> ---
> >>  drivers/net/ethernet/intel/Kconfig              | 11 +++++++++++
> >>  drivers/net/ethernet/intel/fm10k/fm10k_netdev.c |  6 +++---
> >>  2 files changed, 14 insertions(+), 3 deletions(-)
> > 
> > Looks good to me.  Thanks for resolving this.
> > 
> > Acked-by: Alexander Duyck <alexander.h.duyck@intel.com>
> 
> I expect this will go via Jeff Kirsher, CC:'d.

Thanks, I will add the patch to my queue.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 819 bytes --]