From a643c60051746d299475b02330b5afdff1897477 Mon Sep 17 00:00:00 2001 From: Jesse Brandeburg Date: Thu, 31 Aug 2006 14:27:50 -0700 Subject: [PATCH] --- yaml --- r: 35214 b: refs/heads/master c: a91bb6a8b411bdd8053601d7c2254d54670a4df6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ixgb/ixgb_ethtool.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index bc246152ad30..7478f48e1f78 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f990b426afb2f6ed77ba9ec272bdfe3d5d3a3d39 +refs/heads/master: a91bb6a8b411bdd8053601d7c2254d54670a4df6 diff --git a/trunk/drivers/net/ixgb/ixgb_ethtool.c b/trunk/drivers/net/ixgb/ixgb_ethtool.c index cf19b898ba9b..ba621083830a 100644 --- a/trunk/drivers/net/ixgb/ixgb_ethtool.c +++ b/trunk/drivers/net/ixgb/ixgb_ethtool.c @@ -654,11 +654,7 @@ ixgb_phys_id(struct net_device *netdev, uint32_t data) mod_timer(&adapter->blink_timer, jiffies); - if (data) - schedule_timeout_interruptible(data * HZ); - else - schedule_timeout_interruptible(MAX_SCHEDULE_TIMEOUT); - + msleep_interruptible(data * 1000); del_timer_sync(&adapter->blink_timer); ixgb_led_off(&adapter->hw); clear_bit(IXGB_LED_ON, &adapter->led_status);