netdev - [PATCH] net: sched: make the watchdog functions more coherent

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:   Wed,  3 Jun 2020 23:21:13 +0200
From:   Valentin Longchamp <valentin@...gchamp.me>
To:     netdev@...r.kernel.org
Cc:     jiri@...nulli.us, xiyou.wangcong@...il.com, jhs@...atatu.com,
        Valentin Longchamp <valentin@...gchamp.me>
Subject: [PATCH] net: sched: make the watchdog functions more coherent

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@...gchamp.me>
---
 net/sched/sch_generic.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 2efd5b61acef..f3cb740a2941 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -465,12 +465,7 @@ void __netdev_watchdog_up(struct net_device *dev)
 	}
 }
 
-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))
@@ -1111,7 +1106,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);
@@ -1198,7 +1193,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.
-- 
2.25.1