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

Commit 6633d381 authored by Singhai, Anjali's avatar Singhai, Anjali Committed by David S. Miller
Browse files

Revert "i40e: remove CONFIG_I40E_VXLAN" 



This reverts commit 8fe26999.
The case where VXLAN is a module and i40e driver is inbuilt
will not be handled properly with this change since i40e
will have an undefined symbol vxlan_get_rx_port in it.

v2: Add a signed-off-by.

Signed-off-by: default avatarAnjali Singhai Jain <anjali.singhai@intel.com>
Acked-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b48565f5

drivers/net/ethernet/intel/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -269,6 +269,17 @@ config I40E 
	  To compile this driver as a module, choose M here. The module

	  will be called i40e.



config I40E_VXLAN

	bool "Virtual eXtensible Local Area Network Support"

	default n

	depends on I40E && VXLAN && !(I40E=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.



config I40E_DCB

	bool "Data Center Bridging (DCB) Support"

	default n

drivers/net/ethernet/intel/i40e/i40e.h

+3 −1
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ struct i40e_pf { 
	u32 fd_atr_cnt;

	u32 fd_tcp_rule;



#if IS_ENABLED(CONFIG_VXLAN)

#ifdef CONFIG_I40E_VXLAN

	__be16  vxlan_ports[I40E_MAX_PF_UDP_OFFLOAD_PORTS];

	u16 pending_vxlan_bitmap;
@@ -322,7 +322,9 @@ struct i40e_pf { 
#define I40E_FLAG_FD_ATR_ENABLED		BIT_ULL(22)

#define I40E_FLAG_PTP				BIT_ULL(25)

#define I40E_FLAG_MFP_ENABLED			BIT_ULL(26)

#ifdef CONFIG_I40E_VXLAN

#define I40E_FLAG_VXLAN_FILTER_SYNC		BIT_ULL(27)

#endif

#define I40E_FLAG_PORT_ID_VALID			BIT_ULL(28)

#define I40E_FLAG_DCB_CAPABLE			BIT_ULL(29)

#define I40E_FLAG_RSS_AQ_CAPABLE		BIT_ULL(31)

drivers/net/ethernet/intel/i40e/i40e_main.c

+6 −6
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
/* Local includes */

#include "i40e.h"

#include "i40e_diag.h"

#if IS_ENABLED(CONFIG_VXLAN)

#ifdef CONFIG_I40E_VXLAN

#include <net/vxlan.h>

#endif
@@ -5294,7 +5294,7 @@ int i40e_open(struct net_device *netdev) 
						       TCP_FLAG_CWR) >> 16);

	wr32(&pf->hw, I40E_GLLAN_TSOMSK_L, be32_to_cpu(TCP_FLAG_CWR) >> 16);



#if IS_ENABLED(CONFIG_VXLAN)

#ifdef CONFIG_I40E_VXLAN

	vxlan_get_rx_port(netdev);

#endif
@@ -6990,7 +6990,7 @@ static void i40e_handle_mdd_event(struct i40e_pf *pf) 
	i40e_flush(hw);

}



#if IS_ENABLED(CONFIG_VXLAN)

#ifdef CONFIG_I40E_VXLAN

/**

 * i40e_sync_vxlan_filters_subtask - Sync the VSI filter list with HW

 * @pf: board private structure
@@ -7057,7 +7057,7 @@ static void i40e_service_task(struct work_struct *work) 
	i40e_watchdog_subtask(pf);

	i40e_fdir_reinit_subtask(pf);

	i40e_sync_filters_subtask(pf);

#if IS_ENABLED(CONFIG_VXLAN)

#ifdef CONFIG_I40E_VXLAN

	i40e_sync_vxlan_filters_subtask(pf);

#endif

	i40e_clean_adminq_subtask(pf);
@@ -8433,7 +8433,7 @@ static int i40e_set_features(struct net_device *netdev, 
	return 0;

}



#if IS_ENABLED(CONFIG_VXLAN)

#ifdef CONFIG_I40E_VXLAN

/**

 * i40e_get_vxlan_port_idx - Lookup a possibly offloaded for Rx UDP port

 * @pf: board private structure
@@ -8753,7 +8753,7 @@ static const struct net_device_ops i40e_netdev_ops = { 
	.ndo_get_vf_config	= i40e_ndo_get_vf_config,

	.ndo_set_vf_link_state	= i40e_ndo_set_vf_link_state,

	.ndo_set_vf_spoofchk	= i40e_ndo_set_vf_spoofchk,

#if IS_ENABLED(CONFIG_VXLAN)

#ifdef CONFIG_I40E_VXLAN

	.ndo_add_vxlan_port	= i40e_add_vxlan_port,

	.ndo_del_vxlan_port	= i40e_del_vxlan_port,

#endif