bridge: netlink: account for IFLA_BRPORT_{B, M}CAST_FLOOD size and policy (9051247d) · Commits · 戴 / test

The attribute sizes for IFLA_BRPORT_MCAST_FLOOD and IFLA_BRPORT_BCAST_FLOOD weren't accounted for in br_port_info_size() when they were added. Do so now and also add the corresponding policy entries: Cc: Nikolay Aleksandrov <nikolay@cumulusnetworks.com> Cc: Mike Manning <mmanning@brocade.com> Fixes: ("net: bridge: add per-port multicast flood flag") Fixes: ("bridge: add per-port broadcast flood flag") Signed-off-by:

Tobias Klauser <tklauser@distanz.ch> Acked-by:

Nikolay Aleksandrov <nikolay@cumulusnetworks.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

net/bridge/br_netlink.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -133,6 +133,8 @@ static inline size_t br_port_info_size(void)
		+ nla_total_size(1) /* IFLA_BRPORT_MCAST_TO_UCAST */
		+ nla_total_size(1) /* IFLA_BRPORT_LEARNING */
		+ nla_total_size(1) /* IFLA_BRPORT_UNICAST_FLOOD */
		+ nla_total_size(1) /* IFLA_BRPORT_MCAST_FLOOD */
		+ nla_total_size(1) /* IFLA_BRPORT_BCAST_FLOOD */
		+ nla_total_size(1) /* IFLA_BRPORT_PROXYARP */
		+ nla_total_size(1) /* IFLA_BRPORT_PROXYARP_WIFI */
		+ nla_total_size(1) /* IFLA_BRPORT_VLAN_TUNNEL */
		@@ -633,6 +635,8 @@ static const struct nla_policy br_port_policy[IFLA_BRPORT_MAX + 1] = {
		[IFLA_BRPORT_PROXYARP_WIFI] = { .type = NLA_U8 },
		[IFLA_BRPORT_MULTICAST_ROUTER] = { .type = NLA_U8 },
		[IFLA_BRPORT_MCAST_TO_UCAST] = { .type = NLA_U8 },
		[IFLA_BRPORT_MCAST_FLOOD] = { .type = NLA_U8 },
		[IFLA_BRPORT_BCAST_FLOOD] = { .type = NLA_U8 },
		};

		/* Change the state of the port and notify spanning tree */

Admin message