1 files changed, 21 insertions, 50 deletions

diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c
index a31d280ffb6d..1d7bf4049c02 100644
--- a/drivers/net/e1000e/ethtool.c
+++ b/drivers/net/e1000e/ethtool.c
@@ -1851,64 +1851,35 @@ static int e1000_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
         return 0;
 }
 
-/* toggle LED 4 times per second = 2 "blinks" per second */
-#define E1000_ID_INTERVAL       (HZ/4)
-
-/* bit defines for adapter->led_status */
-#define E1000_LED_ON            0
-
-void e1000e_led_blink_task(struct work_struct *work)
-{
-        struct e1000_adapter *adapter = container_of(work,
-                                        struct e1000_adapter, led_blink_task);
-
-        if (test_and_change_bit(E1000_LED_ON, &adapter->led_status))
-                adapter->hw.mac.ops.led_off(&adapter->hw);
-        else
-                adapter->hw.mac.ops.led_on(&adapter->hw);
-}
-
-static void e1000_led_blink_callback(unsigned long data)
-{
-        struct e1000_adapter *adapter = (struct e1000_adapter *) data;
-
-        schedule_work(&adapter->led_blink_task);
-        mod_timer(&adapter->blink_timer, jiffies + E1000_ID_INTERVAL);
-}
-
-static int e1000_phys_id(struct net_device *netdev, u32 data)
+static int e1000_set_phys_id(struct net_device *netdev,
+                             enum ethtool_phys_id_state state)
 {
         struct e1000_adapter *adapter = netdev_priv(netdev);
         struct e1000_hw *hw = &adapter->hw;
 
-        if (!data)
-                data = INT_MAX;
+        switch (state) {
+        case ETHTOOL_ID_ACTIVE:
+                if (!hw->mac.ops.blink_led)
+                        return 2;       /* cycle on/off twice per second */
 
-        if ((hw->phy.type == e1000_phy_ife) ||
-            (hw->mac.type == e1000_pchlan) ||
-            (hw->mac.type == e1000_pch2lan) ||
-            (hw->mac.type == e1000_82583) ||
-            (hw->mac.type == e1000_82574)) {
-                if (!adapter->blink_timer.function) {
-                        init_timer(&adapter->blink_timer);
-                        adapter->blink_timer.function =
-                                e1000_led_blink_callback;
-                        adapter->blink_timer.data = (unsigned long) adapter;
-                }
-                mod_timer(&adapter->blink_timer, jiffies);
-                msleep_interruptible(data * 1000);
-                del_timer_sync(&adapter->blink_timer);
+                hw->mac.ops.blink_led(hw);
+                break;
+
+        case ETHTOOL_ID_INACTIVE:
                 if (hw->phy.type == e1000_phy_ife)
                         e1e_wphy(hw, IFE_PHY_SPECIAL_CONTROL_LED, 0);
-        } else {
-                e1000e_blink_led(hw);
-                msleep_interruptible(data * 1000);
-        }
+                hw->mac.ops.led_off(hw);
+                hw->mac.ops.cleanup_led(hw);
+                break;
 
-        hw->mac.ops.led_off(hw);
-        clear_bit(E1000_LED_ON, &adapter->led_status);
-        hw->mac.ops.cleanup_led(hw);
+        case ETHTOOL_ID_ON:
+                adapter->hw.mac.ops.led_on(&adapter->hw);
+                break;
 
+        case ETHTOOL_ID_OFF:
+                adapter->hw.mac.ops.led_off(&adapter->hw);
+                break;
+        }
         return 0;
 }
 
@@ -2074,7 +2045,7 @@ static const struct ethtool_ops e1000_ethtool_ops = {
         .set_tso                = e1000_set_tso,
         .self_test              = e1000_diag_test,
         .get_strings            = e1000_get_strings,
-        .phys_id                = e1000_phys_id,
+        .set_phys_id            = e1000_set_phys_id,
         .get_ethtool_stats      = e1000_get_ethtool_stats,
         .get_sset_count         = e1000e_get_sset_count,
         .get_coalesce           = e1000_get_coalesce,