1 files changed, 23 insertions, 39 deletions

diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
index f4d0922ec65b..ec0fa426cce2 100644
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
@@ -158,9 +158,9 @@ static int e1000_get_settings(struct net_device *netdev,
 
                 e1000_get_speed_and_duplex(hw, &adapter->link_speed,
                                                    &adapter->link_duplex);
-                ecmd->speed = adapter->link_speed;
+                ethtool_cmd_speed_set(ecmd, adapter->link_speed);
 
-                /* unfortunatly FULL_DUPLEX != DUPLEX_FULL
+                /* unfortunately FULL_DUPLEX != DUPLEX_FULL
                  *          and HALF_DUPLEX != DUPLEX_HALF */
 
                 if (adapter->link_duplex == FULL_DUPLEX)
@@ -168,7 +168,7 @@ static int e1000_get_settings(struct net_device *netdev,
                 else
                         ecmd->duplex = DUPLEX_HALF;
         } else {
-                ecmd->speed = -1;
+                ethtool_cmd_speed_set(ecmd, -1);
                 ecmd->duplex = -1;
         }
 
@@ -197,11 +197,13 @@ static int e1000_set_settings(struct net_device *netdev,
                                                  ADVERTISED_TP |
                                                  ADVERTISED_Autoneg;
                 ecmd->advertising = hw->autoneg_advertised;
-        } else
-                if (e1000_set_spd_dplx(adapter, ecmd->speed + ecmd->duplex)) {
+        } else {
+                u32 speed = ethtool_cmd_speed(ecmd);
+                if (e1000_set_spd_dplx(adapter, speed, ecmd->duplex)) {
                         clear_bit(__E1000_RESETTING, &adapter->flags);
                         return -EINVAL;
                 }
+        }
 
         /* reset the link */
 
@@ -1753,46 +1755,28 @@ 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
-
-static void e1000_led_blink_callback(unsigned long data)
+static int e1000_set_phys_id(struct net_device *netdev,
+                             enum ethtool_phys_id_state state)
 {
-        struct e1000_adapter *adapter = (struct e1000_adapter *) data;
+        struct e1000_adapter *adapter = netdev_priv(netdev);
         struct e1000_hw *hw = &adapter->hw;
 
-        if (test_and_change_bit(E1000_LED_ON, &adapter->led_status))
-                e1000_led_off(hw);
-        else
-                e1000_led_on(hw);
+        switch (state) {
+        case ETHTOOL_ID_ACTIVE:
+                e1000_setup_led(hw);
+                return 2;
 
-        mod_timer(&adapter->blink_timer, jiffies + E1000_ID_INTERVAL);
-}
-
-static int e1000_phys_id(struct net_device *netdev, u32 data)
-{
-        struct e1000_adapter *adapter = netdev_priv(netdev);
-        struct e1000_hw *hw = &adapter->hw;
+        case ETHTOOL_ID_ON:
+                e1000_led_on(hw);
+                break;
 
-        if (!data)
-                data = INT_MAX;
+        case ETHTOOL_ID_OFF:
+                e1000_led_off(hw);
+                break;
 
-        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;
+        case ETHTOOL_ID_INACTIVE:
+                e1000_cleanup_led(hw);
         }
-        e1000_setup_led(hw);
-        mod_timer(&adapter->blink_timer, jiffies);
-        msleep_interruptible(data * 1000);
-        del_timer_sync(&adapter->blink_timer);
-
-        e1000_led_off(hw);
-        clear_bit(E1000_LED_ON, &adapter->led_status);
-        e1000_cleanup_led(hw);
 
         return 0;
 }
@@ -1929,7 +1913,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         = e1000_get_sset_count,
         .get_coalesce           = e1000_get_coalesce,