aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Duyck <alexander.h.duyck@intel.com>2009-07-23 14:08:16 -0400
committerDavid S. Miller <davem@davemloft.net>2009-07-26 12:46:46 -0400
commit12645a196eccb9209f88915f56a686086dea1a16 (patch)
tree3293caef36ebe4df5a08bfb8a9fe146086f0877b
parentf3e7841ca3608db6e0207cd8af5561f065882517 (diff)
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>
-rw-r--r--drivers/net/igb/e1000_82575.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/igb/e1000_82575.c b/drivers/net/igb/e1000_82575.c
index f946bed66c71..606c25c56a01 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)
1000 **/ 1000 **/
1001static s32 igb_setup_copper_link_82575(struct e1000_hw *hw) 1001static s32 igb_setup_copper_link_82575(struct e1000_hw *hw)
1002{ 1002{
1003 u32 ctrl, led_ctrl; 1003 u32 ctrl;
1004 s32 ret_val; 1004 s32 ret_val;
1005 bool link; 1005 bool link;
1006 1006
@@ -1015,11 +1015,6 @@ static s32 igb_setup_copper_link_82575(struct e1000_hw *hw)
1015 break; 1015 break;
1016 case e1000_phy_igp_3: 1016 case e1000_phy_igp_3:
1017 ret_val = igb_copper_link_setup_igp(hw); 1017 ret_val = igb_copper_link_setup_igp(hw);
1018 /* Setup activity LED */
1019 led_ctrl = rd32(E1000_LEDCTL);
1020 led_ctrl &= IGP_ACTIVITY_LED_MASK;
1021 led_ctrl |= (IGP_ACTIVITY_LED_ENABLE | IGP_LED3_MODE);
1022 wr32(E1000_LEDCTL, led_ctrl);
1023 break; 1018 break;
1024 default: 1019 default:
1025 ret_val = -E1000_ERR_PHY; 1020 ret_val = -E1000_ERR_PHY;