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

net: bridge: vlan: add support for mcast query interval global option 



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

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

include/uapi/linux/if_bridge.h

+1 −0
Original line number Diff line number Diff line
@@ -557,6 +557,7 @@ enum { 
	BRIDGE_VLANDB_GOPTS_PAD,

	BRIDGE_VLANDB_GOPTS_MCAST_MEMBERSHIP_INTVL,

	BRIDGE_VLANDB_GOPTS_MCAST_QUERIER_INTVL,

	BRIDGE_VLANDB_GOPTS_MCAST_QUERY_INTVL,

	__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
@@ -1184,6 +1184,8 @@ br_multicast_ctx_options_equal(const struct net_bridge_mcast *brmctx1, 
	       brmctx2->multicast_membership_interval &&

	       brmctx1->multicast_querier_interval ==

	       brmctx2->multicast_querier_interval &&

	       brmctx1->multicast_query_interval ==

	       brmctx2->multicast_query_interval &&

#if IS_ENABLED(CONFIG_IPV6)

	       brmctx1->multicast_mld_version ==

	       brmctx2->multicast_mld_version &&

net/bridge/br_vlan_options.c

+13 −0
Original line number Diff line number Diff line
@@ -309,6 +309,10 @@ bool br_vlan_global_opts_fill(struct sk_buff *skb, u16 vid, u16 vid_range, 
	if (nla_put_u64_64bit(skb, BRIDGE_VLANDB_GOPTS_MCAST_QUERIER_INTVL,

			      clockval, BRIDGE_VLANDB_GOPTS_PAD))

		goto out_err;

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

	if (nla_put_u64_64bit(skb, BRIDGE_VLANDB_GOPTS_MCAST_QUERY_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,
@@ -340,6 +344,7 @@ static size_t rtnl_vlan_global_opts_nlmsg_size(void) 
		+ nla_total_size(sizeof(u64)) /* BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL */

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

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

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

#endif

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

}
@@ -449,6 +454,13 @@ static int br_vlan_process_global_one_opts(const struct net_bridge *br, 
		v->br_mcast_ctx.multicast_querier_interval = clock_t_to_jiffies(val);

		*changed = true;

	}

	if (tb[BRIDGE_VLANDB_GOPTS_MCAST_QUERY_INTVL]) {

		u64 val;



		val = nla_get_u64(tb[BRIDGE_VLANDB_GOPTS_MCAST_QUERY_INTVL]);

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

		*changed = true;

	}

#if IS_ENABLED(CONFIG_IPV6)

	if (tb[BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION]) {

		u8 ver;
@@ -470,6 +482,7 @@ static const struct nla_policy br_vlan_db_gpol[BRIDGE_VLANDB_GOPTS_MAX + 1] = { 
	[BRIDGE_VLANDB_GOPTS_RANGE]	= { .type = NLA_U16 },

	[BRIDGE_VLANDB_GOPTS_MCAST_SNOOPING]	= { .type = NLA_U8 },

	[BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION]	= { .type = NLA_U8 },

	[BRIDGE_VLANDB_GOPTS_MCAST_QUERY_INTVL]	= { .type = NLA_U64 },

	[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 },