Skip to content

Commit 7de0eeb

Browse files
Wang Liangkuba-moo
authored andcommitted
net: bridge: remove unused argument of br_multicast_query_expired()
Since commit 67b746f ("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 <[email protected]> Reviewed-by: Ido Schimmel <[email protected]> Acked-by: Nikolay Aleksandrov <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 88250d4 commit 7de0eeb

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

net/bridge/br_multicast.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4049,8 +4049,7 @@ int br_multicast_rcv(struct net_bridge_mcast **brmctx,
40494049
}
40504050

40514051
static void br_multicast_query_expired(struct net_bridge_mcast *brmctx,
4052-
struct bridge_mcast_own_query *query,
4053-
struct bridge_mcast_querier *querier)
4052+
struct bridge_mcast_own_query *query)
40544053
{
40554054
spin_lock(&brmctx->br->multicast_lock);
40564055
if (br_multicast_ctx_vlan_disabled(brmctx))
@@ -4069,8 +4068,7 @@ static void br_ip4_multicast_query_expired(struct timer_list *t)
40694068
struct net_bridge_mcast *brmctx = timer_container_of(brmctx, t,
40704069
ip4_own_query.timer);
40714070

4072-
br_multicast_query_expired(brmctx, &brmctx->ip4_own_query,
4073-
&brmctx->ip4_querier);
4071+
br_multicast_query_expired(brmctx, &brmctx->ip4_own_query);
40744072
}
40754073

40764074
#if IS_ENABLED(CONFIG_IPV6)
@@ -4079,8 +4077,7 @@ static void br_ip6_multicast_query_expired(struct timer_list *t)
40794077
struct net_bridge_mcast *brmctx = timer_container_of(brmctx, t,
40804078
ip6_own_query.timer);
40814079

4082-
br_multicast_query_expired(brmctx, &brmctx->ip6_own_query,
4083-
&brmctx->ip6_querier);
4080+
br_multicast_query_expired(brmctx, &brmctx->ip6_own_query);
40844081
}
40854082
#endif
40864083

0 commit comments

Comments
 (0)