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

net: bridge: vlan: dump mcast ctx querier state 



Use the new mcast querier state dump infrastructure and export vlans'
mcast context querier state embedded in attribute
BRIDGE_VLANDB_GOPTS_MCAST_QUERIER_STATE.

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

include/uapi/linux/if_bridge.h

+1 −0
Original line number Diff line number Diff line
@@ -563,6 +563,7 @@ enum { 
	BRIDGE_VLANDB_GOPTS_MCAST_QUERIER,

	BRIDGE_VLANDB_GOPTS_MCAST_ROUTER,

	BRIDGE_VLANDB_GOPTS_MCAST_ROUTER_PORTS,

	BRIDGE_VLANDB_GOPTS_MCAST_QUERIER_STATE,

	__BRIDGE_VLANDB_GOPTS_MAX

};

#define BRIDGE_VLANDB_GOPTS_MAX (__BRIDGE_VLANDB_GOPTS_MAX - 1)

net/bridge/br_vlan_options.c

+4 −1
Original line number Diff line number Diff line
@@ -299,7 +299,9 @@ bool br_vlan_global_opts_fill(struct sk_buff *skb, u16 vid, u16 vid_range, 
	    nla_put_u8(skb, BRIDGE_VLANDB_GOPTS_MCAST_QUERIER,

		       v_opts->br_mcast_ctx.multicast_querier) ||

	    nla_put_u8(skb, BRIDGE_VLANDB_GOPTS_MCAST_ROUTER,

		       v_opts->br_mcast_ctx.multicast_router))

		       v_opts->br_mcast_ctx.multicast_router) ||

	    br_multicast_dump_querier_state(skb, &v_opts->br_mcast_ctx,

					    BRIDGE_VLANDB_GOPTS_MCAST_QUERIER_STATE))

		goto out_err;



	clockval = jiffies_to_clock_t(v_opts->br_mcast_ctx.multicast_last_member_interval);
@@ -379,6 +381,7 @@ static size_t rtnl_vlan_global_opts_nlmsg_size(void) 
		+ nla_total_size(sizeof(u64)) /* BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_INTVL */

		+ nla_total_size(sizeof(u8)) /* BRIDGE_VLANDB_GOPTS_MCAST_QUERIER */

		+ nla_total_size(sizeof(u8)) /* BRIDGE_VLANDB_GOPTS_MCAST_ROUTER */

		+ br_multicast_querier_state_size() /* BRIDGE_VLANDB_GOPTS_MCAST_QUERIER_STATE */

#endif

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

}