Commit 77f6abab authored by Nikolay Aleksandrov's avatar Nikolay Aleksandrov Committed by David S. Miller
Browse files

net: bridge: vlan: add support for mcast last member interval global option 



Add support to change and retrieve global vlan multicast last member
interval option.

Signed-off-by: default avatarNikolay Aleksandrov <nikolay@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 50725f6e

include/uapi/linux/if_bridge.h

+2 −0
Original line number Diff line number Diff line
@@ -553,6 +553,8 @@ enum { 
	BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION,

	BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_CNT,

	BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_CNT,

	BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL,

	BRIDGE_VLANDB_GOPTS_PAD,

	__BRIDGE_VLANDB_GOPTS_MAX

};

#define BRIDGE_VLANDB_GOPTS_MAX (__BRIDGE_VLANDB_GOPTS_MAX - 1)

net/bridge/br_private.h

+2 −0
Original line number Diff line number Diff line
@@ -1178,6 +1178,8 @@ br_multicast_ctx_options_equal(const struct net_bridge_mcast *brmctx1, 
	       brmctx2->multicast_last_member_count &&

	       brmctx1->multicast_startup_query_count ==

	       brmctx2->multicast_startup_query_count &&

	       brmctx1->multicast_last_member_interval ==

	       brmctx2->multicast_last_member_interval &&

#if IS_ENABLED(CONFIG_IPV6)

	       brmctx1->multicast_mld_version ==

	       brmctx2->multicast_mld_version &&

net/bridge/br_vlan_options.c

+15 −0
Original line number Diff line number Diff line
@@ -272,6 +272,7 @@ bool br_vlan_global_opts_can_enter_range(const struct net_bridge_vlan *v_curr, 
bool br_vlan_global_opts_fill(struct sk_buff *skb, u16 vid, u16 vid_range,

			      const struct net_bridge_vlan *v_opts)

{

	u64 clockval __maybe_unused;

	struct nlattr *nest;



	nest = nla_nest_start(skb, BRIDGE_VLANDB_GLOBAL_OPTIONS);
@@ -296,6 +297,11 @@ bool br_vlan_global_opts_fill(struct sk_buff *skb, u16 vid, u16 vid_range, 
			v_opts->br_mcast_ctx.multicast_startup_query_count))

		goto out_err;



	clockval = jiffies_to_clock_t(v_opts->br_mcast_ctx.multicast_last_member_interval);

	if (nla_put_u64_64bit(skb, BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL,

			      clockval, BRIDGE_VLANDB_GOPTS_PAD))

		goto out_err;



#if IS_ENABLED(CONFIG_IPV6)

	if (nla_put_u8(skb, BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION,

		       v_opts->br_mcast_ctx.multicast_mld_version))
@@ -323,6 +329,7 @@ static size_t rtnl_vlan_global_opts_nlmsg_size(void) 
		+ nla_total_size(sizeof(u8)) /* BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION */

		+ nla_total_size(sizeof(u32)) /* BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_CNT */

		+ nla_total_size(sizeof(u32)) /* BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_CNT */

		+ nla_total_size(sizeof(u64)) /* BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL */

#endif

		+ nla_total_size(sizeof(u16)); /* BRIDGE_VLANDB_GOPTS_RANGE */

}
@@ -411,6 +418,13 @@ static int br_vlan_process_global_one_opts(const struct net_bridge *br, 
		v->br_mcast_ctx.multicast_startup_query_count = cnt;

		*changed = true;

	}

	if (tb[BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL]) {

		u64 val;



		val = nla_get_u64(tb[BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL]);

		v->br_mcast_ctx.multicast_last_member_interval = clock_t_to_jiffies(val);

		*changed = true;

	}

#if IS_ENABLED(CONFIG_IPV6)

	if (tb[BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION]) {

		u8 ver;
@@ -435,6 +449,7 @@ static const struct nla_policy br_vlan_db_gpol[BRIDGE_VLANDB_GOPTS_MAX + 1] = { 
	[BRIDGE_VLANDB_GOPTS_MCAST_IGMP_VERSION]	= { .type = NLA_U8 },

	[BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_CNT]	= { .type = NLA_U32 },

	[BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_CNT]	= { .type = NLA_U32 },

	[BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL]	= { .type = NLA_U64 },

};



int br_vlan_rtm_process_global_options(struct net_device *dev,