diff options
| author | Stefan Rompf <srompf@isg.de> | 2002-12-03 19:48:03 -0800 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2002-12-03 19:48:03 -0800 |
| commit | 63c937c91ac0cc30116dfb5760ddcf9edf606ab4 (patch) | |
| tree | d03300c39944846dd0703ed29e0c3df87fc02175 /include/linux | |
| parent | 0397a5fb70519d8fac45f86b42c154111f72a8e2 (diff) | |
[NET]: Add device linkwatch functionality.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netdevice.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index f2c8daf526aa..513b89ca7836 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -207,7 +207,8 @@ enum netdev_state_t __LINK_STATE_PRESENT, __LINK_STATE_SCHED, __LINK_STATE_NOCARRIER, - __LINK_STATE_RX_SCHED + __LINK_STATE_RX_SCHED, + __LINK_STATE_LINKWATCH_PENDING }; @@ -631,6 +632,8 @@ static inline void dev_put(struct net_device *dev) * who is responsible for serialization of these calls. */ +extern void linkwatch_fire_event(struct net_device *dev); + static inline int netif_carrier_ok(struct net_device *dev) { return !test_bit(__LINK_STATE_NOCARRIER, &dev->state); @@ -640,14 +643,16 @@ extern void __netdev_watchdog_up(struct net_device *dev); static inline void netif_carrier_on(struct net_device *dev) { - clear_bit(__LINK_STATE_NOCARRIER, &dev->state); + if (test_and_clear_bit(__LINK_STATE_NOCARRIER, &dev->state)) + linkwatch_fire_event(dev); if (netif_running(dev)) __netdev_watchdog_up(dev); } static inline void netif_carrier_off(struct net_device *dev) { - set_bit(__LINK_STATE_NOCARRIER, &dev->state); + if (!test_and_set_bit(__LINK_STATE_NOCARRIER, &dev->state)) + linkwatch_fire_event(dev); } /* Hot-plugging. */ |