diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-31 17:39:21 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-31 17:39:21 -0400 |
| commit | 7c440e7990ea22c0c374c59a5fbd79b0579d1517 (patch) | |
| tree | 4fa6513ee2740479bf9c2796a3911eefa485572b /drivers/net/ixgb/ixgb_ethtool.c | |
| parent | a422142cfdf90d889d8d3e2affb8311a381530b7 (diff) | |
| parent | 9ee093f653bae98cb56b0669819d4bccb8c05fa4 (diff) | |
Merge branch 'upstream' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into upstream
Diffstat (limited to 'drivers/net/ixgb/ixgb_ethtool.c')
| -rw-r--r-- | drivers/net/ixgb/ixgb_ethtool.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/ixgb/ixgb_ethtool.c b/drivers/net/ixgb/ixgb_ethtool.c index cf19b898ba9..ba621083830 100644 --- a/drivers/net/ixgb/ixgb_ethtool.c +++ b/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); |