diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 09:05:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 09:05:25 -0700 |
| commit | e5dfa9282f3db461a896a6692b529e1823ba98c6 (patch) | |
| tree | 574d23cebc57c657373b0e1b6692c047aba8dd6e /include/linux/netdevice.h | |
| parent | 5dd962494f76fb3ef1196cd420b5d6260d7a3766 (diff) | |
| parent | b2ab040db85835e54c7559533df7f85902617926 (diff) | |
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'include/linux/netdevice.h')
| -rw-r--r-- | include/linux/netdevice.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 368e4c825ff..a9281b24c40 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -873,11 +873,9 @@ static inline void netif_rx_complete(struct net_device *dev) static inline void netif_poll_disable(struct net_device *dev) { - while (test_and_set_bit(__LINK_STATE_RX_SCHED, &dev->state)) { + while (test_and_set_bit(__LINK_STATE_RX_SCHED, &dev->state)) /* No hurry. */ - current->state = TASK_INTERRUPTIBLE; - schedule_timeout(1); - } + schedule_timeout_interruptible(1); } static inline void netif_poll_enable(struct net_device *dev) |