diff options
| author | Alexander Duyck <alexander.h.duyck@intel.com> | 2009-07-23 18:08:16 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-26 09:46:46 -0700 |
| commit | 12645a196eccb9209f88915f56a686086dea1a16 (patch) | |
| tree | 3293caef36ebe4df5a08bfb8a9fe146086f0877b /drivers/net/igb | |
| parent | f3e7841ca3608db6e0207cd8af5561f065882517 (diff) | |
| download | kernel_samsung_smdk4412-12645a196eccb9209f88915f56a686086dea1a16.zip kernel_samsung_smdk4412-12645a196eccb9209f88915f56a686086dea1a16.tar.gz kernel_samsung_smdk4412-12645a196eccb9209f88915f56a686086dea1a16.tar.bz2 | |
igb: do not overwrite EEPROM LED settings
The igb driver was overwritting the LED settings that were configured via
EEPROM. This is not correct behavior as the LED settings are meant to be
configured by EEPROM and not changed. This change removes the code that
was setting the LED behavior on the interface.
Signed-off-by: Alexander Duyck <alexander.h.duyck@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/igb')
| -rw-r--r-- | drivers/net/igb/e1000_82575.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/igb/e1000_82575.c b/drivers/net/igb/e1000_82575.c index f946bed..606c25c 100644 --- a/drivers/net/igb/e1000_82575.c +++ b/drivers/net/igb/e1000_82575.c @@ -1000,7 +1000,7 @@ static s32 igb_init_hw_82575(struct e1000_hw *hw) **/ static s32 igb_setup_copper_link_82575(struct e1000_hw *hw) { - u32 ctrl, led_ctrl; + u32 ctrl; s32 ret_val; bool link; @@ -1015,11 +1015,6 @@ static s32 igb_setup_copper_link_82575(struct e1000_hw *hw) break; case e1000_phy_igp_3: ret_val = igb_copper_link_setup_igp(hw); - /* Setup activity LED */ - led_ctrl = rd32(E1000_LEDCTL); - led_ctrl &= IGP_ACTIVITY_LED_MASK; - led_ctrl |= (IGP_ACTIVITY_LED_ENABLE | IGP_LED3_MODE); - wr32(E1000_LEDCTL, led_ctrl); break; default: ret_val = -E1000_ERR_PHY; |