net/aarp: replace schedule_timeout() with msleep()

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

Subsystems (2)

Networking Network drivers

lore

Share & tools

lore

[email protected]

author

2005-03-06 22:21 UTC #0 lore raw

PATCH 2/5 net/aarp: replace schedule_timeout() with msleep()

Use msleep() instead of schedule_timeout() to guarantee the task delays as expected. The current code is not wrong, but it does not account for early return due to signals, so I think msleep() should be appropriate.

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

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

---

 kj-domen/net/appletalk/aarp.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

net/appletalk/aarp.c renamed from net/appletalk/aarp.c~msleep-net_appletalk_aarp +3 -4

diff -puN net/appletalk/aarp.c~msleep-net_appletalk_aarp net/appletalk/aarp.c
@@ -35,6 +35,7 @@
 #include <net/datalink.h>
 #include <net/psnap.h>
 #include <linux/atalk.h>
+#include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>

@@ -462,8 +463,7 @@ void aarp_probe_network(struct atalk_ifa
 			aarp_send_probe(atif->dev, &atif->address);
 
 			/* Defer 1/10th */
-			current->state = TASK_INTERRUPTIBLE;
-			schedule_timeout(HZ / 10);
+			msleep(100);
 
 			if (atif->status & ATIF_PROBE_FAIL)
 				break;

@@ -510,9 +510,8 @@ int aarp_proxy_probe_network(struct atal
 		aarp_send_probe(atif->dev, sa);
 
 		/* Defer 1/10th */
-		current->state = TASK_INTERRUPTIBLE;
 		write_unlock_bh(&aarp_lock);
-		schedule_timeout(HZ / 10);
+		msleep(100);
 		write_lock_bh(&aarp_lock);
 
 		if (entry->status & ATIF_PROBE_FAIL)