Merge ../bleed-2.6

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/net/ixgb/ixgb_ethtool.c b/drivers/net/ixgb/ixgb_ethtool.c
index 9d026ed77ddd..04e47189d830 100644
--- a/drivers/net/ixgb/ixgb_ethtool.c
+++ b/drivers/net/ixgb/ixgb_ethtool.c
@@ -645,11 +645,10 @@ ixgb_phys_id(struct net_device *netdev, uint32_t data)
 
         mod_timer(&adapter->blink_timer, jiffies);
 
-        set_current_state(TASK_INTERRUPTIBLE);
-        if(data)
-                schedule_timeout(data * HZ);
+        if (data)
+                schedule_timeout_interruptible(data * HZ);
         else
-                schedule_timeout(MAX_SCHEDULE_TIMEOUT);
+                schedule_timeout_interruptible(MAX_SCHEDULE_TIMEOUT);
 
         del_timer_sync(&adapter->blink_timer);
         ixgb_led_off(&adapter->hw);
@@ -723,6 +722,7 @@ struct ethtool_ops ixgb_ethtool_ops = {
         .phys_id = ixgb_phys_id,
         .get_stats_count = ixgb_get_stats_count,
         .get_ethtool_stats = ixgb_get_ethtool_stats,
+        .get_perm_addr = ethtool_op_get_perm_addr,
 };
 
 void ixgb_set_ethtool_ops(struct net_device *netdev)