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

git-mirror · Jul 29, 2005 · dddf8f9 · dddf8f9
2 parents 911656f + 6192b54
commit dddf8f9
Showing 1 changed file with 1 addition and 2 deletions.
diff --git 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);
 	}
 
 	/*