diff options
Diffstat (limited to 'drivers/net/e1000/e1000_hw.c')
-rw-r--r-- | drivers/net/e1000/e1000_hw.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c index 796c4f7d4260..29e6f6aba9e2 100644 --- a/drivers/net/e1000/e1000_hw.c +++ b/drivers/net/e1000/e1000_hw.c | |||
@@ -2367,6 +2367,7 @@ e1000_phy_force_speed_duplex(struct e1000_hw *hw) | |||
2367 | 2367 | ||
2368 | /* Need to reset the PHY or these changes will be ignored */ | 2368 | /* Need to reset the PHY or these changes will be ignored */ |
2369 | mii_ctrl_reg |= MII_CR_RESET; | 2369 | mii_ctrl_reg |= MII_CR_RESET; |
2370 | |||
2370 | /* Disable MDI-X support for 10/100 */ | 2371 | /* Disable MDI-X support for 10/100 */ |
2371 | } else if (hw->phy_type == e1000_phy_ife) { | 2372 | } else if (hw->phy_type == e1000_phy_ife) { |
2372 | ret_val = e1000_read_phy_reg(hw, IFE_PHY_MDIX_CONTROL, &phy_data); | 2373 | ret_val = e1000_read_phy_reg(hw, IFE_PHY_MDIX_CONTROL, &phy_data); |
@@ -2379,6 +2380,7 @@ e1000_phy_force_speed_duplex(struct e1000_hw *hw) | |||
2379 | ret_val = e1000_write_phy_reg(hw, IFE_PHY_MDIX_CONTROL, phy_data); | 2380 | ret_val = e1000_write_phy_reg(hw, IFE_PHY_MDIX_CONTROL, phy_data); |
2380 | if (ret_val) | 2381 | if (ret_val) |
2381 | return ret_val; | 2382 | return ret_val; |
2383 | |||
2382 | } else { | 2384 | } else { |
2383 | /* Clear Auto-Crossover to force MDI manually. IGP requires MDI | 2385 | /* Clear Auto-Crossover to force MDI manually. IGP requires MDI |
2384 | * forced whenever speed or duplex are forced. | 2386 | * forced whenever speed or duplex are forced. |
@@ -5841,6 +5843,7 @@ e1000_mta_set(struct e1000_hw *hw, | |||
5841 | hash_reg = (hash_value >> 5) & 0x7F; | 5843 | hash_reg = (hash_value >> 5) & 0x7F; |
5842 | if (hw->mac_type == e1000_ich8lan) | 5844 | if (hw->mac_type == e1000_ich8lan) |
5843 | hash_reg &= 0x1F; | 5845 | hash_reg &= 0x1F; |
5846 | |||
5844 | hash_bit = hash_value & 0x1F; | 5847 | hash_bit = hash_value & 0x1F; |
5845 | 5848 | ||
5846 | mta = E1000_READ_REG_ARRAY(hw, MTA, hash_reg); | 5849 | mta = E1000_READ_REG_ARRAY(hw, MTA, hash_reg); |
@@ -6026,6 +6029,7 @@ e1000_id_led_init(struct e1000_hw * hw) | |||
6026 | else | 6029 | else |
6027 | eeprom_data = ID_LED_DEFAULT; | 6030 | eeprom_data = ID_LED_DEFAULT; |
6028 | } | 6031 | } |
6032 | |||
6029 | for (i = 0; i < 4; i++) { | 6033 | for (i = 0; i < 4; i++) { |
6030 | temp = (eeprom_data >> (i << 2)) & led_mask; | 6034 | temp = (eeprom_data >> (i << 2)) & led_mask; |
6031 | switch (temp) { | 6035 | switch (temp) { |
@@ -9013,5 +9017,3 @@ e1000_init_lcd_from_nvm(struct e1000_hw *hw) | |||
9013 | return E1000_SUCCESS; | 9017 | return E1000_SUCCESS; |
9014 | } | 9018 | } |
9015 | 9019 | ||
9016 | |||
9017 | |||