Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

bridge: netlink: add support for igmp's hash_max 



Add IFLA_BR_MCAST_HASH_MAX to allow setting/getting br->hash_max via
netlink.

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

include/uapi/linux/if_link.h

+1 −0
Original line number Diff line number Diff line
@@ -250,6 +250,7 @@ enum { 
	IFLA_BR_MCAST_QUERY_USE_IFADDR,

	IFLA_BR_MCAST_QUERIER,

	IFLA_BR_MCAST_HASH_ELASTICITY,

	IFLA_BR_MCAST_HASH_MAX,

	__IFLA_BR_MAX,

};

net/bridge/br_netlink.c

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

	[IFLA_BR_MCAST_QUERIER] = { .type = NLA_U8 },

	[IFLA_BR_MCAST_HASH_ELASTICITY] = { .type = NLA_U32 },

	[IFLA_BR_MCAST_HASH_MAX] = { .type = NLA_U32 },

};



static int br_changelink(struct net_device *brdev, struct nlattr *tb[],
@@ -904,6 +905,14 @@ static int br_changelink(struct net_device *brdev, struct nlattr *tb[], 


		br->hash_elasticity = val;

	}



	if (data[IFLA_BR_MCAST_HASH_MAX]) {

		u32 hash_max = nla_get_u32(data[IFLA_BR_MCAST_HASH_MAX]);



		err = br_multicast_set_hash_max(br, hash_max);

		if (err)

			return err;

	}

#endif



	return 0;
@@ -939,6 +948,7 @@ static size_t br_get_size(const struct net_device *brdev) 
	       nla_total_size(sizeof(u8)) +     /* IFLA_BR_MCAST_QUERY_USE_IFADDR */

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

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

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

#endif

	       0;

}
@@ -1003,7 +1013,8 @@ static int br_fill_info(struct sk_buff *skb, const struct net_device *brdev) 
		       br->multicast_query_use_ifaddr) ||

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

	    nla_put_u32(skb, IFLA_BR_MCAST_HASH_ELASTICITY,

			br->hash_elasticity))

			br->hash_elasticity) ||

	    nla_put_u32(skb, IFLA_BR_MCAST_HASH_MAX, br->hash_max))

		return -EMSGSIZE;

#endif