From: Nishanth Aravamudan <nacc@us.ibm.com>
Subject: [Kernel-janitors] [PATCH 2.6.9-rc2 19/38] 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 <nacc@us.ibm.com>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Domen Puncer <domen@coderock.org>
---
 ixgb_ethtool.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Index: quilt/drivers/net/ixgb/ixgb_ethtool.c
===================================================================
--- quilt.orig/drivers/net/ixgb/ixgb_ethtool.c
+++ quilt/drivers/net/ixgb/ixgb_ethtool.c
@@ -620,9 +620,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);