Re: [PATCH net-next 08/14] bridge: mcast: Avoid arming group timer when (S, G) corresponds to a source

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 08/12/2022 17:28, Ido Schimmel wrote:
> User space will soon be able to install a (*, G) with a source list,
> prompting the creation of a (S, G) entry for each source.
> 
> In this case, the group timer of the (S, G) entry should never be set.
> 
> Solve this by adding a new field to the MDB configuration structure that
> denotes whether the (S, G) corresponds to a source or not.
> 
> The field will be set in a subsequent patch where br_mdb_add_group_sg()
> is called in order to create a (S, G) entry for each user provided
> source.
> 
> Signed-off-by: Ido Schimmel <idosch@xxxxxxxxxx>
> ---
>  net/bridge/br_mdb.c     | 2 +-
>  net/bridge/br_private.h | 1 +
>  2 files changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c
> index 95780652cdbf..7cda9d1c5c93 100644
> --- a/net/bridge/br_mdb.c
> +++ b/net/bridge/br_mdb.c
> @@ -814,7 +814,7 @@ static int br_mdb_add_group_sg(const struct br_mdb_config *cfg,
>  		return -ENOMEM;
>  	}
>  	rcu_assign_pointer(*pp, p);
> -	if (!(flags & MDB_PG_FLAGS_PERMANENT))
> +	if (!(flags & MDB_PG_FLAGS_PERMANENT) && !cfg->src_entry)
>  		mod_timer(&p->timer,
>  			  now + brmctx->multicast_membership_interval);
>  	br_mdb_notify(cfg->br->dev, mp, p, RTM_NEWMDB);
> diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
> index 74f17b56c9eb..e98bfe3c02e1 100644
> --- a/net/bridge/br_private.h
> +++ b/net/bridge/br_private.h
> @@ -98,6 +98,7 @@ struct br_mdb_config {
>  	struct net_bridge_port		*p;
>  	struct br_mdb_entry		*entry;
>  	struct br_ip			group;
> +	bool				src_entry;
>  };
>  #endif
>  

Acked-by: Nikolay Aleksandrov <razor@xxxxxxxxxxxxx>




[Index of Archives]     [Netdev]     [AoE Tools]     [Linux Wireless]     [Kernel Newbies]     [Security]     [Linux for Hams]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux RAID]     [Linux Admin]     [Samba]     [Video 4 Linux]

  Powered by Linux