diff options
| author | David S. Miller <davem@davemloft.net> | 2014-11-29 20:47:48 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-11-29 20:47:48 -0800 |
| commit | 60b7379dc5b1743427b031cca53e30860a38ada6 (patch) | |
| tree | c0462b8dd188861bd04f36dd31672b7446e35dd8 /net/bridge | |
| parent | a523a5ecc8c6ddceb8f783f600605553e5ad8963 (diff) | |
| parent | 7a5a4f978750756755dc839014e13d1b088ccc8e (diff) | |
| download | talos-obmc-linux-60b7379dc5b1743427b031cca53e30860a38ada6.tar.gz talos-obmc-linux-60b7379dc5b1743427b031cca53e30860a38ada6.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/br_netlink.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c index 86c239b06f6e..9f5eb55a4d3a 100644 --- 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 }, }; |
