* [PATCH net-next] net: hsr: convert to use new timer API
@ 2024-09-12 3:39 Yu Liao
2024-09-13 8:26 ` Simon Horman
2024-09-15 17:20 ` Jakub Kicinski
0 siblings, 2 replies; 3+ messages in thread
From: Yu Liao @ 2024-09-12 3:39 UTC (permalink / raw)
To: davem; +Cc: liaoyu15, xiexiuqi, netdev, edumazet, kuba, pabeni
del_timer_sync() has been renamed to timer_delete_sync(). Inconsistent
API usage makes the code a bit confusing, so replace with the new API.
No functional changes intended.
Signed-off-by: Yu Liao <liaoyu15@huawei.com>
---
net/hsr/hsr_netlink.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/hsr/hsr_netlink.c b/net/hsr/hsr_netlink.c
index f6ff0b61e08a..6f09b9512484 100644
--- a/net/hsr/hsr_netlink.c
+++ b/net/hsr/hsr_netlink.c
@@ -128,9 +128,9 @@ static void hsr_dellink(struct net_device *dev, struct list_head *head)
{
struct hsr_priv *hsr = netdev_priv(dev);
- del_timer_sync(&hsr->prune_timer);
- del_timer_sync(&hsr->prune_proxy_timer);
- del_timer_sync(&hsr->announce_timer);
+ timer_delete_sync(&hsr->prune_timer);
+ timer_delete_sync(&hsr->prune_proxy_timer);
+ timer_delete_sync(&hsr->announce_timer);
timer_delete_sync(&hsr->announce_proxy_timer);
hsr_debugfs_term(hsr);
--
2.33.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net-next] net: hsr: convert to use new timer API
2024-09-12 3:39 [PATCH net-next] net: hsr: convert to use new timer API Yu Liao
@ 2024-09-13 8:26 ` Simon Horman
2024-09-15 17:20 ` Jakub Kicinski
1 sibling, 0 replies; 3+ messages in thread
From: Simon Horman @ 2024-09-13 8:26 UTC (permalink / raw)
To: Yu Liao; +Cc: davem, xiexiuqi, netdev, edumazet, kuba, pabeni
On Thu, Sep 12, 2024 at 11:39:12AM +0800, Yu Liao wrote:
> del_timer_sync() has been renamed to timer_delete_sync(). Inconsistent
> API usage makes the code a bit confusing, so replace with the new API.
>
> No functional changes intended.
>
> Signed-off-by: Yu Liao <liaoyu15@huawei.com>
Thanks, I agree that it is currently inconsistent.
And that this patch addresses all relevant calls in this function.
Reviewed-by: Simon Horman <horms@kernel.org>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-next] net: hsr: convert to use new timer API
2024-09-12 3:39 [PATCH net-next] net: hsr: convert to use new timer API Yu Liao
2024-09-13 8:26 ` Simon Horman
@ 2024-09-15 17:20 ` Jakub Kicinski
1 sibling, 0 replies; 3+ messages in thread
From: Jakub Kicinski @ 2024-09-15 17:20 UTC (permalink / raw)
To: Yu Liao; +Cc: davem, xiexiuqi, netdev, edumazet, pabeni
On Thu, 12 Sep 2024 11:39:12 +0800 Yu Liao wrote:
> del_timer_sync() has been renamed to timer_delete_sync(). Inconsistent
> API usage makes the code a bit confusing, so replace with the new API.
>
> No functional changes intended
We didn't merge this patch in time for 6.12, please repost in 2 weeks
--
pw-bot: defer
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-09-15 17:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-12 3:39 [PATCH net-next] net: hsr: convert to use new timer API Yu Liao
2024-09-13 8:26 ` Simon Horman
2024-09-15 17:20 ` Jakub Kicinski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).