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

[karo-tx-linux.git] / net / bridge / br_netlink.c

diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index 225ef7d5370166baff69080996cf64ff68b055f6..650986473577b59331339bdd07276180d446c80f 100644 (file)
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -748,8 +748,8 @@ int br_setlink(struct net_device *dev, struct nlmsghdr *nlh, u16 flags)
 
        if (p && protinfo) {
                if (protinfo->nla_type & NLA_F_NESTED) {
-                       err = nla_parse_nested(tb, IFLA_BRPORT_MAX,
-                                              protinfo, br_port_policy);
+                       err = nla_parse_nested(tb, IFLA_BRPORT_MAX, protinfo,
+                                              br_port_policy, NULL);
                        if (err)
                                return err;