Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

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 @@
 #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)