Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6b03c10 authored by Andy Zhou's avatar Andy Zhou Committed by Jeff Kirsher
Browse files

fm10k: Add CONFIG_FM10K_VXLAN configuration option 



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: default avatarAndy Zhou <azhou@nicira.com>
Acked-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 13cb2dad

drivers/net/ethernet/intel/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -320,4 +320,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

drivers/net/ethernet/intel/fm10k/fm10k_netdev.c

+3 −3
Original line number Diff line number Diff line
@@ -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)
@@ -556,7 +556,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);