diff options
author | Nishanth Aravamudan <nacc@us.ibm.com> | 2005-06-23 01:11:44 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2005-06-23 01:11:44 -0400 |
commit | 285b3afefacff14bc98e5754b8b48a0a2b42f0df (patch) | |
tree | 3294a65cafb6003455d9280ff630191d97a25e64 /net/appletalk | |
parent | 7abaa27c1c54208bd76fa8bae55839c034aebfb2 (diff) |
[ATALK] aarp: replace schedule_timeout() with msleep()
From: Nishanth Aravamudan <nacc@us.ibm.com>
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 <nacc@us.ibm.com>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/appletalk')
-rw-r--r-- | net/appletalk/aarp.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/appletalk/aarp.c b/net/appletalk/aarp.c index 10d040461021..c34614ea5fce 100644 --- a/net/appletalk/aarp.c +++ b/net/appletalk/aarp.c | |||
@@ -35,6 +35,7 @@ | |||
35 | #include <net/datalink.h> | 35 | #include <net/datalink.h> |
36 | #include <net/psnap.h> | 36 | #include <net/psnap.h> |
37 | #include <linux/atalk.h> | 37 | #include <linux/atalk.h> |
38 | #include <linux/delay.h> | ||
38 | #include <linux/init.h> | 39 | #include <linux/init.h> |
39 | #include <linux/proc_fs.h> | 40 | #include <linux/proc_fs.h> |
40 | #include <linux/seq_file.h> | 41 | #include <linux/seq_file.h> |
@@ -462,8 +463,7 @@ void aarp_probe_network(struct atalk_iface *atif) | |||
462 | aarp_send_probe(atif->dev, &atif->address); | 463 | aarp_send_probe(atif->dev, &atif->address); |
463 | 464 | ||
464 | /* Defer 1/10th */ | 465 | /* Defer 1/10th */ |
465 | current->state = TASK_INTERRUPTIBLE; | 466 | msleep(100); |
466 | schedule_timeout(HZ / 10); | ||
467 | 467 | ||
468 | if (atif->status & ATIF_PROBE_FAIL) | 468 | if (atif->status & ATIF_PROBE_FAIL) |
469 | break; | 469 | break; |
@@ -510,9 +510,8 @@ int aarp_proxy_probe_network(struct atalk_iface *atif, struct atalk_addr *sa) | |||
510 | aarp_send_probe(atif->dev, sa); | 510 | aarp_send_probe(atif->dev, sa); |
511 | 511 | ||
512 | /* Defer 1/10th */ | 512 | /* Defer 1/10th */ |
513 | current->state = TASK_INTERRUPTIBLE; | ||
514 | write_unlock_bh(&aarp_lock); | 513 | write_unlock_bh(&aarp_lock); |
515 | schedule_timeout(HZ / 10); | 514 | msleep(100); |
516 | write_lock_bh(&aarp_lock); | 515 | write_lock_bh(&aarp_lock); |
517 | 516 | ||
518 | if (entry->status & ATIF_PROBE_FAIL) | 517 | if (entry->status & ATIF_PROBE_FAIL) |