diff options
author | Nikolay Aleksandrov <nikolay@cumulusnetworks.com> | 2015-08-04 13:06:33 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-08-07 02:54:42 -0400 |
commit | 786c2077ec8e9eab37a88fc14aac4309a8061e18 (patch) | |
tree | 55ac3b17a9af6449ca633bef8b3516c9e7d13e65 /net/bridge | |
parent | 355b9f9df1f0311f20087350aee8ad96eedca8a9 (diff) |
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: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Fixes: 842a9ae08a25 ("bridge: Extend Proxy ARP design to allow optional rules for Wi-Fi")
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
-rw-r--r-- | net/bridge/br_netlink.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c index 5390536d500c..4d74a0639c4c 100644 --- a/net/bridge/br_netlink.c +++ b/net/bridge/br_netlink.c | |||
@@ -113,6 +113,7 @@ static inline size_t br_port_info_size(void) | |||
113 | + nla_total_size(1) /* IFLA_BRPORT_LEARNING */ | 113 | + nla_total_size(1) /* IFLA_BRPORT_LEARNING */ |
114 | + nla_total_size(1) /* IFLA_BRPORT_UNICAST_FLOOD */ | 114 | + nla_total_size(1) /* IFLA_BRPORT_UNICAST_FLOOD */ |
115 | + nla_total_size(1) /* IFLA_BRPORT_PROXYARP */ | 115 | + nla_total_size(1) /* IFLA_BRPORT_PROXYARP */ |
116 | + nla_total_size(1) /* IFLA_BRPORT_PROXYARP_WIFI */ | ||
116 | + 0; | 117 | + 0; |
117 | } | 118 | } |
118 | 119 | ||
@@ -508,6 +509,7 @@ static const struct nla_policy br_port_policy[IFLA_BRPORT_MAX + 1] = { | |||
508 | [IFLA_BRPORT_LEARNING] = { .type = NLA_U8 }, | 509 | [IFLA_BRPORT_LEARNING] = { .type = NLA_U8 }, |
509 | [IFLA_BRPORT_UNICAST_FLOOD] = { .type = NLA_U8 }, | 510 | [IFLA_BRPORT_UNICAST_FLOOD] = { .type = NLA_U8 }, |
510 | [IFLA_BRPORT_PROXYARP] = { .type = NLA_U8 }, | 511 | [IFLA_BRPORT_PROXYARP] = { .type = NLA_U8 }, |
512 | [IFLA_BRPORT_PROXYARP_WIFI] = { .type = NLA_U8 }, | ||
511 | }; | 513 | }; |
512 | 514 | ||
513 | /* Change the state of the port and notify spanning tree */ | 515 | /* Change the state of the port and notify spanning tree */ |