aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/netdevice.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/netdevice.h')
-rw-r--r--include/linux/netdevice.h14
1 files changed, 2 insertions, 12 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 296cf93a65e0..d8e52edfd526 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -699,19 +699,9 @@ static inline int netif_carrier_ok(const struct net_device *dev)
699 699
700extern void __netdev_watchdog_up(struct net_device *dev); 700extern void __netdev_watchdog_up(struct net_device *dev);
701 701
702static inline void netif_carrier_on(struct net_device *dev) 702extern void netif_carrier_on(struct net_device *dev);
703{
704 if (test_and_clear_bit(__LINK_STATE_NOCARRIER, &dev->state))
705 linkwatch_fire_event(dev);
706 if (netif_running(dev))
707 __netdev_watchdog_up(dev);
708}
709 703
710static inline void netif_carrier_off(struct net_device *dev) 704extern void netif_carrier_off(struct net_device *dev);
711{
712 if (!test_and_set_bit(__LINK_STATE_NOCARRIER, &dev->state))
713 linkwatch_fire_event(dev);
714}
715 705
716/* Hot-plugging. */ 706/* Hot-plugging. */
717static inline int netif_device_present(struct net_device *dev) 707static inline int netif_device_present(struct net_device *dev)