diff options
| author | Nikolay Aleksandrov <nikolay@cumulusnetworks.com> | 2015-08-04 19:06:32 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-07 08:54:42 +0200 |
| commit | 355b9f9df1f0311f20087350aee8ad96eedca8a9 (patch) | |
| tree | a9fab8b3ebe481acc3d11b07d770333000477c95 /net/bridge | |
| parent | Merge tag 'wireless-drivers-for-davem-2015-08-04' of git://git.kernel.org/pub... (diff) | |
| download | linux-355b9f9df1f0311f20087350aee8ad96eedca8a9.tar.xz linux-355b9f9df1f0311f20087350aee8ad96eedca8a9.zip | |
bridge: netlink: account for the IFLA_BRPORT_PROXYARP 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: 958501163ddd ("bridge: Add support for IEEE 802.11 Proxy ARP")
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 3da5525eb8a2..5390536d500c 100644 --- a/net/bridge/br_netlink.c +++ b/net/bridge/br_netlink.c @@ -112,6 +112,7 @@ static inline size_t br_port_info_size(void) + nla_total_size(1) /* IFLA_BRPORT_FAST_LEAVE */ + nla_total_size(1) /* IFLA_BRPORT_LEARNING */ + nla_total_size(1) /* IFLA_BRPORT_UNICAST_FLOOD */ + + nla_total_size(1) /* IFLA_BRPORT_PROXYARP */ + 0; } @@ -506,6 +507,7 @@ static const struct nla_policy br_port_policy[IFLA_BRPORT_MAX + 1] = { [IFLA_BRPORT_FAST_LEAVE]= { .type = NLA_U8 }, [IFLA_BRPORT_LEARNING] = { .type = NLA_U8 }, [IFLA_BRPORT_UNICAST_FLOOD] = { .type = NLA_U8 }, + [IFLA_BRPORT_PROXYARP] = { .type = NLA_U8 }, }; /* Change the state of the port and notify spanning tree */ |