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

Commit 776d4e9f authored by Vasu Dev's avatar Vasu Dev Committed by David S. Miller
Browse files

i40e: adds FCoE configure option 



Adds FCoE config option I40E_FCOE, so that FCoE can be enabled
as needed but otherwise have it disabled by default.

This also eliminate multiple FCoE config checks, instead now just
one config check for CONFIG_I40E_FCOE.

The I40E FCoE was added with 3.17 kernel and therefore this patch
shall be applied to stable 3.17 kernel also.

CC: <stable@vger.kernel.org>
Signed-off-by: default avatarVasu Dev <vasu.dev@intel.com>
Tested-by: default avatarJim Young <jamesx.m.young@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 14b3812f

drivers/net/ethernet/intel/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -281,6 +281,17 @@ config I40E_DCB 


	  If unsure, say N.



config I40E_FCOE

	bool "Fibre Channel over Ethernet (FCoE)"

	default n

	depends on I40E && DCB && FCOE

	---help---

	  Say Y here if you want to use Fibre Channel over Ethernet (FCoE)

	  in the driver. This will create new netdev for exclusive FCoE

	  use with XL710 FCoE offloads enabled.



	  If unsure, say N.



config I40EVF

	tristate "Intel(R) XL710 X710 Virtual Function Ethernet support"

	depends on PCI_MSI

drivers/net/ethernet/intel/i40e/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -44,4 +44,4 @@ i40e-objs := i40e_main.o \ 
	i40e_virtchnl_pf.o



i40e-$(CONFIG_I40E_DCB) += i40e_dcb.o i40e_dcb_nl.o

i40e-$(CONFIG_FCOE:m=y) += i40e_fcoe.o
 
i40e-$(CONFIG_I40E_FCOE) += i40e_fcoe.o

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

+2 −2
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ do { \ 
} while (0)



typedef enum i40e_status_code i40e_status;

#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)

#ifdef CONFIG_I40E_FCOE

#define I40E_FCOE

#endif /* CONFIG_FCOE or CONFIG_FCOE_MODULE */

#endif

#endif /* _I40E_OSDEP_H_ */