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

dddf8f9e · Linus Torvalds · 911656f8 · 6192b54b · dddf8f9e
Commit dddf8f9e authored Jul 28, 2005 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

net/core/dev.c net/core/dev.c +1 -2

No files found.
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -901,8 +901,7 @@ int dev_close(struct net_device *dev)
 	smp_mb__after_clear_bit(); /* Commit netif_running(). */
 	while (test_bit(__LINK_STATE_RX_SCHED, &dev->state)) {
 		/* No hurry. */
-		current->state = TASK_INTERRUPTIBLE;
-		schedule_timeout(1);
+		msleep(1);
 	}

 	/*