]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: bridge: remove unused argument of br_multicast_query_expired()
authorWang Liang <wangliang74@huawei.com>
Thu, 14 Aug 2025 04:23:55 +0000 (12:23 +0800)
committerJakub Kicinski <kuba@kernel.org>
Fri, 15 Aug 2025 17:26:56 +0000 (10:26 -0700)
Since commit 67b746f94ff3 ("net: bridge: mcast: make sure querier
port/address updates are consistent"), the argument 'querier' is unused,
just get rid of it.

Signed-off-by: Wang Liang <wangliang74@huawei.com>
Reviewed-by: Ido Schimmel <idosch@nvidia.com>
Acked-by: Nikolay Aleksandrov <razor@blackwall.org>
Link: https://patch.msgid.link/20250814042355.1720755-1-wangliang74@huawei.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/bridge/br_multicast.c

index 1377f31b719cdd50a14aa3ce00996c210f6c3d82..4dc62d01e2d38fee525b71339ed812afa9c48c15 100644 (file)
@@ -4049,8 +4049,7 @@ int br_multicast_rcv(struct net_bridge_mcast **brmctx,
 }
 
 static void br_multicast_query_expired(struct net_bridge_mcast *brmctx,
-                                      struct bridge_mcast_own_query *query,
-                                      struct bridge_mcast_querier *querier)
+                                      struct bridge_mcast_own_query *query)
 {
        spin_lock(&brmctx->br->multicast_lock);
        if (br_multicast_ctx_vlan_disabled(brmctx))
@@ -4069,8 +4068,7 @@ static void br_ip4_multicast_query_expired(struct timer_list *t)
        struct net_bridge_mcast *brmctx = timer_container_of(brmctx, t,
                                                             ip4_own_query.timer);
 
-       br_multicast_query_expired(brmctx, &brmctx->ip4_own_query,
-                                  &brmctx->ip4_querier);
+       br_multicast_query_expired(brmctx, &brmctx->ip4_own_query);
 }
 
 #if IS_ENABLED(CONFIG_IPV6)
@@ -4079,8 +4077,7 @@ static void br_ip6_multicast_query_expired(struct timer_list *t)
        struct net_bridge_mcast *brmctx = timer_container_of(brmctx, t,
                                                             ip6_own_query.timer);
 
-       br_multicast_query_expired(brmctx, &brmctx->ip6_own_query,
-                                  &brmctx->ip6_querier);
+       br_multicast_query_expired(brmctx, &brmctx->ip6_own_query);
 }
 #endif