net: watchdog: rename __dev_watchdog_up() and dev_watchdog_down()

In commit d7811e623dd4 ("[NET]: Drop tx lock in dev_watchdog_up")
dev_watchdog_up() became a simple wrapper for __netdev_watchdog_up()

Herbert also said : "In 2.6.19 we can eliminate the unnecessary
__dev_watchdog_up and replace it with dev_watchdog_up."

This patch consolidates things to have only two functions, with
a common prefix.

- netdev_watchdog_up(), exported for the sake of one freescale driver.
  This replaces __netdev_watchdog_up() and dev_watchdog_up().

- netdev_watchdog_down(), static to net/sched/sch_generic.c
  This replaces dev_watchdog_down().

Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Reviewed-by: Jason Xing <kerneljasonxing@gmail.com>
Link: https://patch.msgid.link/20250105090924.1661822-1-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c
index f47f8177a93b46e4456388d33e03b0098d6afa22..88510f822759607b34d99e03225a2621fe3039d4 100644 (file)
--- a/drivers/net/ethernet/freescale/ucc_geth.c
+++ b/drivers/net/ethernet/freescale/ucc_geth.c
@@ -1434,7 +1434,7 @@ static void ugeth_activate(struct ucc_geth_private *ugeth)
 
        /* allow to xmit again  */
        netif_tx_wake_all_queues(ugeth->ndev);
-       __netdev_watchdog_up(ugeth->ndev);
+       netdev_watchdog_up(ugeth->ndev);
 }
 
 /* Initialize TBI PHY interface for communicating with the

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index e84602e0226c1c520435f35bb22b1aaf36db2dd1..1812564b52047261bf5de8109ef5e69a96284d34 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -4295,7 +4295,7 @@ static inline bool netif_carrier_ok(const struct net_device *dev)
 
 unsigned long dev_trans_start(struct net_device *dev);
 
-void __netdev_watchdog_up(struct net_device *dev);
+void netdev_watchdog_up(struct net_device *dev);
 
 void netif_carrier_on(struct net_device *dev);
 void netif_carrier_off(struct net_device *dev);

diff --git a/net/core/dev.c b/net/core/dev.c
index 073f682a9653a212198b12bae17fafe7b46f96e9..2179da3dfffc05f7708fe67dc63c52cb3bf1a45a 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3233,7 +3233,7 @@ void netif_device_attach(struct net_device *dev)
        if (!test_and_set_bit(__LINK_STATE_PRESENT, &dev->state) &&
            netif_running(dev)) {
                netif_tx_wake_all_queues(dev);
-               __netdev_watchdog_up(dev);
+               netdev_watchdog_up(dev);
        }
 }
 EXPORT_SYMBOL(netif_device_attach);

diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 8874ae6680952a0531cc5175e1de8510e55914ea..bb7dd351bd651d4aa16945816ee26df3c4a48645 100644 (file)
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -551,25 +551,20 @@ static void dev_watchdog(struct timer_list *t)
                netdev_put(dev, &dev->watchdog_dev_tracker);
 }
 
-void __netdev_watchdog_up(struct net_device *dev)
-{
-       if (dev->netdev_ops->ndo_tx_timeout) {
-               if (dev->watchdog_timeo <= 0)
-                       dev->watchdog_timeo = 5*HZ;
-               if (!mod_timer(&dev->watchdog_timer,
-                              round_jiffies(jiffies + dev->watchdog_timeo)))
-                       netdev_hold(dev, &dev->watchdog_dev_tracker,
-                                   GFP_ATOMIC);
-       }
-}
-EXPORT_SYMBOL_GPL(__netdev_watchdog_up);
-
-static void dev_watchdog_up(struct net_device *dev)
+void netdev_watchdog_up(struct net_device *dev)
 {
-       __netdev_watchdog_up(dev);
+       if (!dev->netdev_ops->ndo_tx_timeout)
+               return;
+       if (dev->watchdog_timeo <= 0)
+               dev->watchdog_timeo = 5*HZ;
+       if (!mod_timer(&dev->watchdog_timer,
+                      round_jiffies(jiffies + dev->watchdog_timeo)))
+               netdev_hold(dev, &dev->watchdog_dev_tracker,
+                           GFP_ATOMIC);
 }
+EXPORT_SYMBOL_GPL(netdev_watchdog_up);
 
-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))
@@ -591,7 +586,7 @@ void netif_carrier_on(struct net_device *dev)
                atomic_inc(&dev->carrier_up_count);
                linkwatch_fire_event(dev);
                if (netif_running(dev))
-                       __netdev_watchdog_up(dev);
+                       netdev_watchdog_up(dev);
        }
 }
 EXPORT_SYMBOL(netif_carrier_on);
@@ -1267,7 +1262,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);
@@ -1366,7 +1361,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 or