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

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

[Valentin Longchamp]

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(-)

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

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

[David Miller]

From: Valentin Longchamp <valentin@longchamp.me>
Date: Wed,  3 Jun 2020 23:21:13 +0200

> 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(-)
> 
> 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)

This patch will not apply if I apply your symbol export patch because
the context above this function will be different.

Please don't do this.

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

[Valentin Longchamp]

Le 05.06.2020 à 00:55, David Miller a écrit :
> From: Valentin Longchamp <valentin@longchamp.me>
> Date: Wed,  3 Jun 2020 23:21:13 +0200
> 
>> 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(-)
>>
>> 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)
> 
> This patch will not apply if I apply your symbol export patch because
> the context above this function will be different.
> 
> Please don't do this.
> 

Yeah, I didn't know how to handle this properly: I kept both patches 
separated because the symbol export should go to stable and this one not.

Is that OK to have only a ("initial") subset of a series aimed for stable ?