Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 776d4e9f5c0229037707f692b386b1f2a5bac054

Authored by Vasu Dev
Committed by David S. Miller
1 parent 14b3812f7a
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

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: Vasu Dev <vasu.dev@intel.com>
Tested-by: Jim Young <jamesx.m.young@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 3 changed files with 14 additions and 3 deletions Side-by-side Diff

drivers/net/ethernet/intel/Kconfig
Diff comments   View file @ 776d4e9
... ... @@ -281,6 +281,17 @@
281 281  
282 282 If unsure, say N.
283 283  
  284 +config I40E_FCOE
  285 + bool "Fibre Channel over Ethernet (FCoE)"
  286 + default n
  287 + depends on I40E && DCB && FCOE
  288 + ---help---
  289 + Say Y here if you want to use Fibre Channel over Ethernet (FCoE)
  290 + in the driver. This will create new netdev for exclusive FCoE
  291 + use with XL710 FCoE offloads enabled.
  292 +
  293 + If unsure, say N.
  294 +
284 295 config I40EVF
285 296 tristate "Intel(R) XL710 X710 Virtual Function Ethernet support"
286 297 depends on PCI_MSI
drivers/net/ethernet/intel/i40e/Makefile
Diff comments   View file @ 776d4e9
... ... @@ -44,5 +44,5 @@
44 44 i40e_virtchnl_pf.o
45 45  
46 46 i40e-$(CONFIG_I40E_DCB) += i40e_dcb.o i40e_dcb_nl.o
47   -i40e-$(CONFIG_FCOE:m=y) += i40e_fcoe.o
  47 +i40e-$(CONFIG_I40E_FCOE) += i40e_fcoe.o
drivers/net/ethernet/intel/i40e/i40e_osdep.h
Diff comments   View file @ 776d4e9
... ... @@ -78,8 +78,8 @@
78 78 } while (0)
79 79  
80 80 typedef enum i40e_status_code i40e_status;
81   -#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
  81 +#ifdef CONFIG_I40E_FCOE
82 82 #define I40E_FCOE
83   -#endif /* CONFIG_FCOE or CONFIG_FCOE_MODULE */
  83 +#endif
84 84 #endif /* _I40E_OSDEP_H_ */