igb: do not overwrite EEPROM LED settings
authorAlexander Duyck <alexander.h.duyck@intel.com>
Thu, 23 Jul 2009 18:08:16 +0000 (18:08 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sun, 26 Jul 2009 16:46:46 +0000 (09:46 -0700)
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>
drivers/net/igb/e1000_82575.c

index f946bed66c71bb744f6576604f59e9c722cc0e90..606c25c56a01e1cc7bc1305d33fd1f3c5096cd0c 100644 (file)
@@ -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;