aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVasu Dev <vasu.dev@intel.com>2014-04-09 01:59:06 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2014-05-29 07:46:14 -0400
commit566bb85db73969453791c05d7fbd83d488247b65 (patch)
treeeefd3238287a44c6545a503cb4e0c5573f80e5b0
parentc9b9b0aeace4d474c5b7a739307180ea4ddcccbf (diff)
i40: disable FCoE for MFP modes
Currently FCoE is not supported with MFP modes, so this patch makes sure it is disabled. It is disabled by overriding HW FCoE capability, so that later it can be re-enabled by just the SW upgrade. Change-ID: I1c0bae5c099b209f56b88bda360031a8565e43e8 Signed-off-by: Vasu Dev <vasu.dev@intel.com> Tested-By: Jack Morgan <jack.morgan@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r--drivers/net/ethernet/intel/i40e/i40e_common.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_common.c b/drivers/net/ethernet/intel/i40e/i40e_common.c
index 064b0aa783f8..2329e2ff2deb 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_common.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_common.c
@@ -1949,6 +1949,12 @@ static void i40e_parse_discover_capabilities(struct i40e_hw *hw, void *buff,
1949 } 1949 }
1950 } 1950 }
1951 1951
1952 /* Software override ensuring FCoE is disabled if npar or mfp
1953 * mode because it is not supported in these modes.
1954 */
1955 if (p->npar_enable || p->mfp_mode_1)
1956 p->fcoe = false;
1957
1952 /* additional HW specific goodies that might 1958 /* additional HW specific goodies that might
1953 * someday be HW version specific 1959 * someday be HW version specific
1954 */ 1960 */