Commit dddf8f9e authored by Linus Torvalds's avatar Linus Torvalds

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

parents 911656f8 6192b54b
...@@ -901,8 +901,7 @@ int dev_close(struct net_device *dev) ...@@ -901,8 +901,7 @@ int dev_close(struct net_device *dev)
smp_mb__after_clear_bit(); /* Commit netif_running(). */ smp_mb__after_clear_bit(); /* Commit netif_running(). */
while (test_bit(__LINK_STATE_RX_SCHED, &dev->state)) { while (test_bit(__LINK_STATE_RX_SCHED, &dev->state)) {
/* No hurry. */ /* No hurry. */
current->state = TASK_INTERRUPTIBLE; msleep(1);
schedule_timeout(1);
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment