diff options
Diffstat (limited to 'drivers/net/e1000e/es2lan.c')
-rw-r--r-- | drivers/net/e1000e/es2lan.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/e1000e/es2lan.c b/drivers/net/e1000e/es2lan.c index 27d21589a69a..38d79a669059 100644 --- a/drivers/net/e1000e/es2lan.c +++ b/drivers/net/e1000e/es2lan.c | |||
@@ -221,9 +221,12 @@ static s32 e1000_init_mac_params_80003es2lan(struct e1000_adapter *adapter) | |||
221 | mac->mta_reg_count = 128; | 221 | mac->mta_reg_count = 128; |
222 | /* Set rar entry count */ | 222 | /* Set rar entry count */ |
223 | mac->rar_entry_count = E1000_RAR_ENTRIES; | 223 | mac->rar_entry_count = E1000_RAR_ENTRIES; |
224 | /* Set if manageability features are enabled. */ | 224 | /* FWSM register */ |
225 | mac->arc_subsystem_valid = (er32(FWSM) & E1000_FWSM_MODE_MASK) | 225 | mac->has_fwsm = true; |
226 | ? true : false; | 226 | /* ARC supported; valid only if manageability features are enabled. */ |
227 | mac->arc_subsystem_valid = | ||
228 | (er32(FWSM) & E1000_FWSM_MODE_MASK) | ||
229 | ? true : false; | ||
227 | /* Adaptive IFS not supported */ | 230 | /* Adaptive IFS not supported */ |
228 | mac->adaptive_ifs = false; | 231 | mac->adaptive_ifs = false; |
229 | 232 | ||
@@ -1380,8 +1383,6 @@ static void e1000_power_down_phy_copper_80003es2lan(struct e1000_hw *hw) | |||
1380 | if (!(hw->mac.ops.check_mng_mode(hw) || | 1383 | if (!(hw->mac.ops.check_mng_mode(hw) || |
1381 | hw->phy.ops.check_reset_block(hw))) | 1384 | hw->phy.ops.check_reset_block(hw))) |
1382 | e1000_power_down_phy_copper(hw); | 1385 | e1000_power_down_phy_copper(hw); |
1383 | |||
1384 | return; | ||
1385 | } | 1386 | } |
1386 | 1387 | ||
1387 | /** | 1388 | /** |