diff options
Diffstat (limited to 'drivers/net/e1000')
| -rw-r--r-- | drivers/net/e1000/e1000_ethtool.c | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c index 791110d4bbaa..54ae8805e79f 100644 --- a/drivers/net/e1000/e1000_ethtool.c +++ b/drivers/net/e1000/e1000_ethtool.c | |||
| @@ -1699,13 +1699,21 @@ e1000_phys_id(struct net_device *netdev, uint32_t data) | |||
| 1699 | mod_timer(&adapter->blink_timer, jiffies); | 1699 | mod_timer(&adapter->blink_timer, jiffies); |
| 1700 | msleep_interruptible(data * 1000); | 1700 | msleep_interruptible(data * 1000); |
| 1701 | del_timer_sync(&adapter->blink_timer); | 1701 | del_timer_sync(&adapter->blink_timer); |
| 1702 | } | 1702 | } else if (adapter->hw.mac_type < e1000_82573) { |
| 1703 | else { | 1703 | E1000_WRITE_REG(&adapter->hw, LEDCTL, |
| 1704 | E1000_WRITE_REG(&adapter->hw, LEDCTL, (E1000_LEDCTL_LED2_BLINK_RATE | | 1704 | (E1000_LEDCTL_LED2_BLINK_RATE | |
| 1705 | E1000_LEDCTL_LED1_BLINK | E1000_LEDCTL_LED2_BLINK | | 1705 | E1000_LEDCTL_LED0_BLINK | E1000_LEDCTL_LED2_BLINK | |
| 1706 | (E1000_LEDCTL_MODE_LED_ON << E1000_LEDCTL_LED2_MODE_SHIFT) | | 1706 | (E1000_LEDCTL_MODE_LED_ON << E1000_LEDCTL_LED2_MODE_SHIFT) | |
| 1707 | (E1000_LEDCTL_MODE_LINK_ACTIVITY << E1000_LEDCTL_LED1_MODE_SHIFT) | | 1707 | (E1000_LEDCTL_MODE_LINK_ACTIVITY << E1000_LEDCTL_LED0_MODE_SHIFT) | |
| 1708 | (E1000_LEDCTL_MODE_LED_OFF << E1000_LEDCTL_LED0_MODE_SHIFT))); | 1708 | (E1000_LEDCTL_MODE_LED_OFF << E1000_LEDCTL_LED1_MODE_SHIFT))); |
| 1709 | msleep_interruptible(data * 1000); | ||
| 1710 | } else { | ||
| 1711 | E1000_WRITE_REG(&adapter->hw, LEDCTL, | ||
| 1712 | (E1000_LEDCTL_LED2_BLINK_RATE | | ||
| 1713 | E1000_LEDCTL_LED1_BLINK | E1000_LEDCTL_LED2_BLINK | | ||
| 1714 | (E1000_LEDCTL_MODE_LED_ON << E1000_LEDCTL_LED2_MODE_SHIFT) | | ||
| 1715 | (E1000_LEDCTL_MODE_LINK_ACTIVITY << E1000_LEDCTL_LED1_MODE_SHIFT) | | ||
| 1716 | (E1000_LEDCTL_MODE_LED_OFF << E1000_LEDCTL_LED0_MODE_SHIFT))); | ||
| 1709 | msleep_interruptible(data * 1000); | 1717 | msleep_interruptible(data * 1000); |
| 1710 | } | 1718 | } |
| 1711 | 1719 | ||