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

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

bridge: netlink: add support for multicast_startup_query_count 



Add IFLA_BR_MCAST_STARTUP_QUERY_CNT to allow setting/getting
br->multicast_startup_query_count via netlink. Also align the ifla
comments.

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

include/uapi/linux/if_link.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -252,6 +252,7 @@ enum { 
	IFLA_BR_MCAST_HASH_ELASTICITY,

	IFLA_BR_MCAST_HASH_ELASTICITY,

	IFLA_BR_MCAST_HASH_MAX,

	IFLA_BR_MCAST_HASH_MAX,

	IFLA_BR_MCAST_LAST_MEMBER_CNT,

	IFLA_BR_MCAST_LAST_MEMBER_CNT,

	IFLA_BR_MCAST_STARTUP_QUERY_CNT,

	__IFLA_BR_MAX,

	__IFLA_BR_MAX,

};

};

net/bridge/br_netlink.c

+16 −6
Original line number Original line Diff line number Diff line
@@ -774,6 +774,7 @@ static const struct nla_policy br_policy[IFLA_BR_MAX + 1] = { 
	[IFLA_BR_MCAST_HASH_ELASTICITY] = { .type = NLA_U32 },

	[IFLA_BR_MCAST_HASH_ELASTICITY] = { .type = NLA_U32 },

	[IFLA_BR_MCAST_HASH_MAX] = { .type = NLA_U32 },

	[IFLA_BR_MCAST_HASH_MAX] = { .type = NLA_U32 },

	[IFLA_BR_MCAST_LAST_MEMBER_CNT] = { .type = NLA_U32 },

	[IFLA_BR_MCAST_LAST_MEMBER_CNT] = { .type = NLA_U32 },

	[IFLA_BR_MCAST_STARTUP_QUERY_CNT] = { .type = NLA_U32 },

};

};





static int br_changelink(struct net_device *brdev, struct nlattr *tb[],

static int br_changelink(struct net_device *brdev, struct nlattr *tb[],
@@ -920,6 +921,12 @@ static int br_changelink(struct net_device *brdev, struct nlattr *tb[], 




		br->multicast_last_member_count = val;

		br->multicast_last_member_count = val;

	}

	}



	if (data[IFLA_BR_MCAST_STARTUP_QUERY_CNT]) {

		u32 val = nla_get_u32(data[IFLA_BR_MCAST_STARTUP_QUERY_CNT]);



		br->multicast_startup_query_count = val;

	}

#endif

#endif





	return 0;

	return 0;
@@ -957,6 +964,7 @@ static size_t br_get_size(const struct net_device *brdev) 
	       nla_total_size(sizeof(u32)) +    /* IFLA_BR_MCAST_HASH_ELASTICITY */

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

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

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

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

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

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

#endif

#endif

	       0;

	       0;

}

}
@@ -1024,7 +1032,9 @@ static int br_fill_info(struct sk_buff *skb, const struct net_device *brdev) 
			br->hash_elasticity) ||

			br->hash_elasticity) ||

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

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

	    nla_put_u32(skb, IFLA_BR_MCAST_LAST_MEMBER_CNT,

	    nla_put_u32(skb, IFLA_BR_MCAST_LAST_MEMBER_CNT,

			br->multicast_last_member_count))

			br->multicast_last_member_count) ||

	    nla_put_u32(skb, IFLA_BR_MCAST_STARTUP_QUERY_CNT,

			br->multicast_startup_query_count))

		return -EMSGSIZE;

		return -EMSGSIZE;

#endif

#endif