net: bridge: remove unused argument of br_multicast_query_expired()

[PATCH net-next] net: bridge: remove unused argument of br_multicast_query_expired()

Posted by Wang Liang 5 months, 3 weeks ago

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>
---
 net/bridge/br_multicast.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 1377f31b719c..4dc62d01e2d3 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -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
 
-- 
2.33.0

Re: [PATCH net-next] net: bridge: remove unused argument of br_multicast_query_expired()

Posted by Nikolay Aleksandrov 5 months, 3 weeks ago

On 8/14/25 07:23, Wang Liang wrote:
> 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>
> ---
>   net/bridge/br_multicast.c | 9 +++------
>   1 file changed, 3 insertions(+), 6 deletions(-)
> 
> diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
> index 1377f31b719c..4dc62d01e2d3 100644
> --- a/net/bridge/br_multicast.c
> +++ b/net/bridge/br_multicast.c
> @@ -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
>   

Acked-by: Nikolay Aleksandrov <razor@blackwall.org>

Re: [PATCH net-next] net: bridge: remove unused argument of br_multicast_query_expired()

Posted by Ido Schimmel 5 months, 3 weeks ago

On Thu, Aug 14, 2025 at 12:23:55PM +0800, Wang Liang wrote:
> 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>