diff options
Diffstat (limited to 'drivers/net/e1000/e1000_ethtool.c')
-rw-r--r-- | drivers/net/e1000/e1000_ethtool.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c index cf5c5f46341f..060915532923 100644 --- a/drivers/net/e1000/e1000_ethtool.c +++ b/drivers/net/e1000/e1000_ethtool.c | |||
@@ -1786,21 +1786,8 @@ e1000_phys_id(struct net_device *netdev, uint32_t data) | |||
1786 | mod_timer(&adapter->blink_timer, jiffies); | 1786 | mod_timer(&adapter->blink_timer, jiffies); |
1787 | msleep_interruptible(data * 1000); | 1787 | msleep_interruptible(data * 1000); |
1788 | del_timer_sync(&adapter->blink_timer); | 1788 | del_timer_sync(&adapter->blink_timer); |
1789 | } else if (adapter->hw.mac_type < e1000_82573) { | ||
1790 | E1000_WRITE_REG(&adapter->hw, LEDCTL, | ||
1791 | (E1000_LEDCTL_LED2_BLINK_RATE | | ||
1792 | E1000_LEDCTL_LED0_BLINK | E1000_LEDCTL_LED2_BLINK | | ||
1793 | (E1000_LEDCTL_MODE_LED_ON << E1000_LEDCTL_LED2_MODE_SHIFT) | | ||
1794 | (E1000_LEDCTL_MODE_LINK_ACTIVITY << E1000_LEDCTL_LED0_MODE_SHIFT) | | ||
1795 | (E1000_LEDCTL_MODE_LED_OFF << E1000_LEDCTL_LED1_MODE_SHIFT))); | ||
1796 | msleep_interruptible(data * 1000); | ||
1797 | } else { | 1789 | } else { |
1798 | E1000_WRITE_REG(&adapter->hw, LEDCTL, | 1790 | e1000_blink_led_start(&adapter->hw); |
1799 | (E1000_LEDCTL_LED2_BLINK_RATE | | ||
1800 | E1000_LEDCTL_LED1_BLINK | E1000_LEDCTL_LED2_BLINK | | ||
1801 | (E1000_LEDCTL_MODE_LED_ON << E1000_LEDCTL_LED2_MODE_SHIFT) | | ||
1802 | (E1000_LEDCTL_MODE_LINK_ACTIVITY << E1000_LEDCTL_LED1_MODE_SHIFT) | | ||
1803 | (E1000_LEDCTL_MODE_LED_OFF << E1000_LEDCTL_LED0_MODE_SHIFT))); | ||
1804 | msleep_interruptible(data * 1000); | 1791 | msleep_interruptible(data * 1000); |
1805 | } | 1792 | } |
1806 | 1793 | ||