Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 285b3afe authored by Nishanth Aravamudan's avatar Nishanth Aravamudan Committed by David S. Miller
Browse files

[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: default avatarNishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: default avatarDomen Puncer <domen@coderock.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7abaa27c

net/appletalk/aarp.c

+3 −4
Original line number Diff line number Diff line
@@ -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_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;
@@ -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)