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

bridge: netlink: add support for multicast_querier 



Add IFLA_BR_MCAST_QUERIER to allow setting/getting br->multicast_querier
via netlink.

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

include/uapi/linux/if_link.h

+1 −0
Original line number Diff line number Diff line
@@ -248,6 +248,7 @@ enum { 
	IFLA_BR_MCAST_ROUTER,

	IFLA_BR_MCAST_SNOOPING,

	IFLA_BR_MCAST_QUERY_USE_IFADDR,

	IFLA_BR_MCAST_QUERIER,

	__IFLA_BR_MAX,

};

net/bridge/br_netlink.c

+12 −1
Original line number Diff line number Diff line
@@ -770,6 +770,7 @@ static const struct nla_policy br_policy[IFLA_BR_MAX + 1] = { 
	[IFLA_BR_MCAST_ROUTER] = { .type = NLA_U8 },

	[IFLA_BR_MCAST_SNOOPING] = { .type = NLA_U8 },

	[IFLA_BR_MCAST_QUERY_USE_IFADDR] = { .type = NLA_U8 },

	[IFLA_BR_MCAST_QUERIER] = { .type = NLA_U8 },

};



static int br_changelink(struct net_device *brdev, struct nlattr *tb[],
@@ -888,6 +889,14 @@ static int br_changelink(struct net_device *brdev, struct nlattr *tb[], 
		val = nla_get_u8(data[IFLA_BR_MCAST_QUERY_USE_IFADDR]);

		br->multicast_query_use_ifaddr = !!val;

	}



	if (data[IFLA_BR_MCAST_QUERIER]) {

		u8 mcast_querier = nla_get_u8(data[IFLA_BR_MCAST_QUERIER]);



		err = br_multicast_set_querier(br, mcast_querier);

		if (err)

			return err;

	}

#endif



	return 0;
@@ -921,6 +930,7 @@ static size_t br_get_size(const struct net_device *brdev) 
	       nla_total_size(sizeof(u8)) +     /* IFLA_BR_MCAST_ROUTER */

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

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

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

#endif

	       0;

}
@@ -982,7 +992,8 @@ static int br_fill_info(struct sk_buff *skb, const struct net_device *brdev) 
	if (nla_put_u8(skb, IFLA_BR_MCAST_ROUTER, br->multicast_router) ||

	    nla_put_u8(skb, IFLA_BR_MCAST_SNOOPING, !br->multicast_disabled) ||

	    nla_put_u8(skb, IFLA_BR_MCAST_QUERY_USE_IFADDR,

		       br->multicast_query_use_ifaddr))

		       br->multicast_query_use_ifaddr) ||

	    nla_put_u8(skb, IFLA_BR_MCAST_QUERIER, br->multicast_querier))

		return -EMSGSIZE;

#endif