Patch "bridge: netlink: account for the IFLA_BRPORT_PROXYARP_WIFI attribute size and policy" has been added to the 4.1-stable tree

This is a note to let you know that I've just added the patch titled

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

to the 4.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
bridge-netlink-account-for-the-ifla_brport_proxyarp_wifi-attribute-size-and-policy.patch
and it can be found in the queue-4.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Nikolay Aleksandrov <[email protected]>
Date: Tue, 4 Aug 2015 19:06:33 +0200
Subject: bridge: netlink: account for the IFLA_BRPORT_PROXYARP_WIFI attribute size and policy

From: Nikolay Aleksandrov <[email protected]>

[ Upstream commit 786c2077ec8e9eab37a88fc14aac4309a8061e18 ]

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.

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

@@ -113,6 +113,7 @@ static inline size_t br_port_info_size(v
 		+ 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;
 }
 

@@ -506,6 +507,7 @@ static const struct nla_policy br_port_p
 	[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 */

Patches currently in stable-queue which might be from [email protected] are

queue-4.1/bonding-correct-the-mac-address-for-follow-fail_over_mac-policy.patch queue-4.1/bridge-netlink-fix-slave_changelink-br_setport-race-conditions.patch queue-4.1/bridge-mdb-fix-double-add-notification.patch queue-4.1/bridge-netlink-account-for-the-ifla_brport_proxyarp-attribute-size-and-policy.patch queue-4.1/bonding-fix-destruction-of-bond-with-devices-different-from-arphrd_ether.patch queue-4.1/bridge-netlink-account-for-the-ifla_brport_proxyarp_wifi-attribute-size-and-policy.patch