Skip to content

Commit

Permalink
[ATALK] aarp: replace schedule_timeout() with msleep()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Nishanth Aravamudan authored and David S. Miller committed Jun 23, 2005
1 parent 7abaa27 commit 285b3af
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions net/appletalk/aarp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -462,8 +463,7 @@ void aarp_probe_network(struct atalk_iface *atif)
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;
Expand Down Expand Up @@ -510,9 +510,8 @@ int aarp_proxy_probe_network(struct atalk_iface *atif, struct atalk_addr *sa)
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)
Expand Down

0 comments on commit 285b3af

Please sign in to comment.