diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2005-02-09 08:19:10 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2005-02-09 08:19:10 -0500 |
| commit | 23750010bfa81de0867ddd4bd4bd7c9b2d27fe05 (patch) | |
| tree | 0b0b2ff8aab00bf3dcb5753a2e7a1217194c1312 /net/core/dev.c | |
| parent | c5ff533d2618c3c26242551e2a9957763f126e2c (diff) | |
| parent | 245f9eba891010ed627fec5b83d0f7b575e3d5ce (diff) | |
Merge modernduck.com:/usr/src/bk/linux-2.5
into modernduck.com:/usr/src/bk/1394-2.6
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 4dc01e26f158..5d4abaa85351 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -108,6 +108,7 @@ #include <linux/kallsyms.h> #include <linux/netpoll.h> #include <linux/rcupdate.h> +#include <linux/delay.h> #ifdef CONFIG_NET_RADIO #include <linux/wireless.h> /* Note : will define WIRELESS_EXT */ #include <net/iw_handler.h> @@ -2899,8 +2900,7 @@ static void netdev_wait_allrefs(struct net_device *dev) rebroadcast_time = jiffies; } - current->state = TASK_INTERRUPTIBLE; - schedule_timeout(HZ / 4); + msleep(250); if (time_after(jiffies, warning_time + 10 * HZ)) { printk(KERN_EMERG "unregister_netdevice: " |