summaryrefslogtreecommitdiff
path: root/net/bridge
diff options
context:
space:
mode:
authorstephen hemminger <stephen@networkplumber.org>2013-03-11 13:52:17 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-28 19:17:07 (GMT)
commit96901fb36cd6370e5ee447b40c89c0f1527bec84 (patch)
tree2bb48f121e99054b4c0d46983f2517732b29cf69 /net/bridge
parent4ed6e83c78dc13ad61bdb6e66694cfa232c1bdc6 (diff)
downloadlinux-fsl-qoriq-96901fb36cd6370e5ee447b40c89c0f1527bec84.tar.xz
bridge: reserve space for IFLA_BRPORT_FAST_LEAVE
[ Upstream commit 3da889b616164bde76a37350cf28e0d17a94e979 ] The bridge multicast fast leave feature was added sufficient space was not reserved in the netlink message. This means the flag may be lost in netlink events and results of queries. Found by observation while looking up some netlink stuff for discussion with Vlad. Problem introduced by commit c2d3babfafbb9f6629cfb47139758e59a5eb0d80 Author: David S. Miller <davem@davemloft.net> Date: Wed Dec 5 16:24:45 2012 -0500 bridge: implement multicast fast leave Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/bridge')
-rw-r--r--net/bridge/br_netlink.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index 5dc66ab..580e176 100644
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -28,6 +28,7 @@ static inline size_t br_port_info_size(void)
+ nla_total_size(1) /* IFLA_BRPORT_MODE */
+ nla_total_size(1) /* IFLA_BRPORT_GUARD */
+ nla_total_size(1) /* IFLA_BRPORT_PROTECT */
+ + nla_total_size(1) /* IFLA_BRPORT_FAST_LEAVE */
+ 0;
}