summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net/bridge/br_multicast.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 5d6fdfb43c04..c2c93c740415 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -2027,9 +2027,11 @@ void br_multicast_port_ctx_deinit(struct net_bridge_mcast_port *pmctx)
bool del = false;
#if IS_ENABLED(CONFIG_IPV6)
- timer_delete_sync(&pmctx->ip6_mc_router_timer);
+ timer_shutdown_sync(&pmctx->ip6_own_query.timer);
+ timer_shutdown_sync(&pmctx->ip6_mc_router_timer);
#endif
- timer_delete_sync(&pmctx->ip4_mc_router_timer);
+ timer_shutdown_sync(&pmctx->ip4_own_query.timer);
+ timer_shutdown_sync(&pmctx->ip4_mc_router_timer);
spin_lock_bh(&br->multicast_lock);
del |= br_ip6_multicast_rport_del(pmctx);