diff options
| author | Don Skidmore | 2015-06-11 02:05:02 +0200 |
|---|---|---|
| committer | Jeff Kirsher | 2015-09-02 01:40:19 +0200 |
| commit | bd8069ace513dd2741bc7177eeebc9a392451db1 (patch) | |
| tree | 6319608afaa5f81a33b8e90fa39d48f729ca50fd /drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | |
| parent | i40e: Set defport behavior for the Main VSI when in promiscuous mode (diff) | |
| download | kernel-qcow2-linux-bd8069ace513dd2741bc7177eeebc9a392451db1.tar.gz kernel-qcow2-linux-bd8069ace513dd2741bc7177eeebc9a392451db1.tar.xz kernel-qcow2-linux-bd8069ace513dd2741bc7177eeebc9a392451db1.zip | |
ixgbe: add new function to check for management presence
This patch adds a support function that will indicate for the
existence of management FW.
Signed-off-by: Donald C Skidmore <donald.c.skidmore@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c')
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c index b1e364d26aa7..08fcf57a22ec 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c @@ -504,16 +504,12 @@ static enum ixgbe_media_type ixgbe_get_media_type_82599(struct ixgbe_hw *hw) **/ static void ixgbe_stop_mac_link_on_d3_82599(struct ixgbe_hw *hw) { - u32 autoc2_reg, fwsm; + u32 autoc2_reg; u16 ee_ctrl_2 = 0; hw->eeprom.ops.read(hw, IXGBE_EEPROM_CTRL_2, &ee_ctrl_2); - /* Check to see if MNG FW could be enabled */ - fwsm = IXGBE_READ_REG(hw, IXGBE_FWSM(hw)); - - if (((fwsm & IXGBE_FWSM_MODE_MASK) != IXGBE_FWSM_FW_MODE_PT) && - !hw->wol_enabled && + if (!ixgbe_mng_present(hw) && !hw->wol_enabled && ee_ctrl_2 & IXGBE_EEPROM_CCD_BIT) { autoc2_reg = IXGBE_READ_REG(hw, IXGBE_AUTOC2); autoc2_reg |= IXGBE_AUTOC2_LINK_DISABLE_ON_D3_MASK; |