Linux Ethernet Bridging - Aug 2015 - [Bridge] [PATCH net 1/2] bridge: netlink: account for the IFLA_BRPORT_PROXYARP attribute size and policy

From: Nikolay Aleksandrov <nikolay at cumulusnetworks.com>

Hi,
When IFLA_BRPORT_PROXYARP and PROXYARP_WIFI were introduced they weren't
accounted for in the get_slave_size() callback and didn't get a policy
entry, so fix it now. Sending as two separate patches because the first
one goes further back than the second and thus we get 2 different Fixes
tags.

Cheers,
 Nik

Nikolay Aleksandrov (2):
  bridge: netlink: account for the IFLA_BRPORT_PROXYARP attribute size
    and policy
  bridge: netlink: account for the IFLA_BRPORT_PROXYARP_WIFI attribute
    size and policy

 net/bridge/br_netlink.c | 4 ++++
 1 file changed, 4 insertions(+)

-- 
2.4.3

From: Nikolay Aleksandrov <nikolay at cumulusnetworks.com>

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 at cumulusnetworks.com>
Fixes: 958501163ddd ("bridge: Add support for IEEE 802.11 Proxy ARP")
---
 net/bridge/br_netlink.c | 2 ++
 1 file changed, 2 insertions(+)

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 */
-- 
2.4.3

From: Nikolay Aleksandrov <nikolay at cumulusnetworks.com>

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 at cumulusnetworks.com>
Fixes: 842a9ae08a25 ("bridge: Extend Proxy ARP design to allow optional
rules for Wi-Fi")
---
 net/bridge/br_netlink.c | 2 ++
 1 file changed, 2 insertions(+)

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)
 		+ 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 */
-- 
2.4.3

On Tue,  4 Aug 2015 19:06:31 +0200
Nikolay Aleksandrov <razor at blackwall.org> wrote:
> From: Nikolay Aleksandrov <nikolay at cumulusnetworks.com>
> 
> Hi,
> When IFLA_BRPORT_PROXYARP and PROXYARP_WIFI were introduced they
weren't
> accounted for in the get_slave_size() callback and didn't get a policy
> entry, so fix it now. Sending as two separate patches because the first
> one goes further back than the second and thus we get 2 different Fixes
> tags.
> 
> Cheers,
>  Nik
> 
> Nikolay Aleksandrov (2):
>   bridge: netlink: account for the IFLA_BRPORT_PROXYARP attribute size
>     and policy
>   bridge: netlink: account for the IFLA_BRPORT_PROXYARP_WIFI attribute
>     size and policy
> 
>  net/bridge/br_netlink.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
Acked-by: Stephen Hemminger <stephen at networkplumber.org>