diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-28 22:12:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-28 22:12:57 -0700 |
| commit | dddf8f9e4b1af852bcd735d5f737c0d0e2ce6e76 (patch) | |
| tree | c435c0d2e7d4420f4e2ffc2cb8ce36123303592b | |
| parent | 911656f8a630e36b22c7e2bba3317dec9174209c (diff) | |
| parent | 6192b54b845ed05cb838f86ca588cc625c703a09 (diff) | |
| download | blackbird-obmc-linux-dddf8f9e4b1af852bcd735d5f737c0d0e2ce6e76.tar.gz blackbird-obmc-linux-dddf8f9e4b1af852bcd735d5f737c0d0e2ce6e76.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
| -rw-r--r-- | net/core/dev.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index ff9dc029233a..52a3bf7ae177 100644 --- 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); } /* |
