Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
This commit is contained in:
commit
dddf8f9e4b
1 changed files with 1 additions and 2 deletions
|
@ -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);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Add table
Reference in a new issue