diff options
author | Len Brown | 2005-07-30 07:55:32 +0200 |
---|---|---|
committer | Len Brown | 2005-07-30 07:55:32 +0200 |
commit | adbedd34244e2b054557002817f979a9b004a405 (patch) | |
tree | 78e4a524e84f8b3e23ae8b49ac689048584e4668 /net/core | |
parent | /home/lenb/src/to-linus branch 'acpi-2.6.12' (diff) | |
parent | [PATCH] agp: restore APBASE after setting APSIZE (diff) | |
download | kernel-qcow2-linux-adbedd34244e2b054557002817f979a9b004a405.tar.gz kernel-qcow2-linux-adbedd34244e2b054557002817f979a9b004a405.tar.xz kernel-qcow2-linux-adbedd34244e2b054557002817f979a9b004a405.zip |
merge 2.6.13-rc4 with ACPI's to-linus tree
Diffstat (limited to 'net/core')
-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); } /* |