net/ixgb_ethtool: replace schedule_timeout() with msleep_interruptible()

PATCH Applied [email protected] 1 participant 1 message Mar 6, 2005

Subsystems (2)

Networking Network drivers

lore

Share & tools

lore

[email protected]

author

2005-03-06 10:32 UTC #0 lore raw

PATCH 5/26 net/ixgb_ethtool: replace schedule_timeout() with msleep_interruptible()

Use msleep_interruptible() instead of schedule_timeout() to guarantee the task delays as expected.

Signed-off-by Nishanth Aravamudan <[email protected]>

Signed-off-by Maximilian Attems <[email protected]>

Signed-off-by Domen Puncer <[email protected]>

---

 kj-domen/drivers/net/ixgb/ixgb_ethtool.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

drivers/net/ixgb/ixgb_ethtool.c renamed from drivers/net/ixgb/ixgb_ethtool.c~msleep_interruptible-drivers_net_ixgb_ixgb_ethtool +2 -2

diff -puN drivers/net/ixgb/ixgb_ethtool.c~msleep_interruptible-drivers_net_ixgb_ixgb_ethtool drivers/net/ixgb/ixgb_ethtool.c
@@ -617,9 +617,9 @@ ixgb_phys_id(struct net_device *netdev, 
 
 	set_current_state(TASK_INTERRUPTIBLE);
 	if(data)
-		schedule_timeout(data * HZ);
+		msleep_interruptible(data * 1000);
 	else
-		schedule_timeout(MAX_SCHEDULE_TIMEOUT);
+		msleep_interruptible(jiffies_to_msecs(MAX_SCHEDULE_TIMEOUT));
 
 	del_timer_sync(&adapter->blink_timer);
 	ixgb_led_off(&adapter->hw);