Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2014-11-29 20:47:48 -08:00
parent a523a5ecc8 7a5a4f9787
commit 60b7379dc5
193 changed files with 1306 additions and 840 deletions
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@ -281,6 +281,7 @@ static const struct nla_policy br_port_policy[IFLA_BRPORT_MAX + 1] = {
 	[IFLA_BRPORT_MODE]	= { .type = NLA_U8 },
 	[IFLA_BRPORT_GUARD]	= { .type = NLA_U8 },
 	[IFLA_BRPORT_PROTECT]	= { .type = NLA_U8 },
+	[IFLA_BRPORT_FAST_LEAVE]= { .type = NLA_U8 },
 	[IFLA_BRPORT_LEARNING]	= { .type = NLA_U8 },
 	[IFLA_BRPORT_UNICAST_FLOOD] = { .type = NLA_U8 },
 };