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

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

bridge: netlink: account for the IFLA_BRPORT_PROXYARP_WIFI attribute size and policy 



The attribute size wasn't accounted for in the get_slave_size() callback
(br_port_get_slave_size) when it was introduced, so fix it now. Also add
a policy entry for it in br_port_policy.

Signed-off-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Fixes: 842a9ae0 ("bridge: Extend Proxy ARP design to allow optional rules for Wi-Fi")
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 355b9f9d

net/bridge/br_netlink.c

+2 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ static inline size_t br_port_info_size(void) 
		+ nla_total_size(1)	/* IFLA_BRPORT_LEARNING */

		+ nla_total_size(1)	/* IFLA_BRPORT_UNICAST_FLOOD */

		+ nla_total_size(1)	/* IFLA_BRPORT_PROXYARP */

		+ nla_total_size(1)	/* IFLA_BRPORT_PROXYARP_WIFI */

		+ 0;

}
@@ -508,6 +509,7 @@ static const struct nla_policy br_port_policy[IFLA_BRPORT_MAX + 1] = { 
	[IFLA_BRPORT_LEARNING]	= { .type = NLA_U8 },

	[IFLA_BRPORT_UNICAST_FLOOD] = { .type = NLA_U8 },

	[IFLA_BRPORT_PROXYARP]	= { .type = NLA_U8 },

	[IFLA_BRPORT_PROXYARP_WIFI] = { .type = NLA_U8 },

};



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