@@ -466,12 +466,7 @@ void __netdev_watchdog_up(struct net_device *dev)
}
EXPORT_SYMBOL_GPL(__netdev_watchdog_up);
-static void dev_watchdog_up(struct net_device *dev)
-{
- __netdev_watchdog_up(dev);
-}
-
-static void dev_watchdog_down(struct net_device *dev)
+static void __netdev_watchdog_down(struct net_device *dev)
{
netif_tx_lock_bh(dev);
if (del_timer(&dev->watchdog_timer))
@@ -1124,7 +1119,7 @@ void dev_activate(struct net_device *dev)
if (need_watchdog) {
netif_trans_update(dev);
- dev_watchdog_up(dev);
+ __netdev_watchdog_up(dev);
}
}
EXPORT_SYMBOL(dev_activate);
@@ -1210,7 +1205,7 @@ void dev_deactivate_many(struct list_head *head)
dev_deactivate_queue(dev, dev_ingress_queue(dev),
&noop_qdisc);
- dev_watchdog_down(dev);
+ __netdev_watchdog_down(dev);
}
/* Wait for outstanding qdisc-less dev_queue_xmit calls.
Remove dev_watchdog_up() that directly called __netdev_watchdog_up() and rename dev_watchdog_down() to __netdev_watchdog_down() for symmetry. Signed-off-by: Valentin Longchamp <valentin@longchamp.me> --- net/sched/sch_generic.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)