diff options
| author | Vasu Dev | 2015-01-14 14:14:07 +0100 |
|---|---|---|
| committer | David S. Miller | 2015-01-14 22:48:39 +0100 |
| commit | 776d4e9f5c0229037707f692b386b1f2a5bac054 (patch) | |
| tree | 4826110fe06ee0e5d5fa75e739be2e8b45a38095 /drivers/net/ethernet/intel/i40e/i40e_osdep.h | |
| parent | cxgb4vf: Fix queue allocation for 40G adapter (diff) | |
| download | kernel-qcow2-linux-776d4e9f5c0229037707f692b386b1f2a5bac054.tar.gz kernel-qcow2-linux-776d4e9f5c0229037707f692b386b1f2a5bac054.tar.xz kernel-qcow2-linux-776d4e9f5c0229037707f692b386b1f2a5bac054.zip | |
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>
Diffstat (limited to 'drivers/net/ethernet/intel/i40e/i40e_osdep.h')
| -rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e_osdep.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_osdep.h b/drivers/net/ethernet/intel/i40e/i40e_osdep.h index 045b5c4b98b3..ad802dd0f67a 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_osdep.h +++ b/drivers/net/ethernet/intel/i40e/i40e_osdep.h @@ -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_ */ |