summaryrefslogtreecommitdiffstats
path: root/net/bridge
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2015-12-14 20:29:00 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2015-12-14 20:31:16 +0100
commita4ec80082c82f3fda775d13b2a72aac38248ced6 (patch)
tree23affbe49c629cbbdb5553ca78aa444a7ccf2ead /net/bridge
parent19576c9478682a398276c994ea0d2696474df32b (diff)
parentcb4396edd84ed73081635fb933d19c1410fafaf4 (diff)
downloadop-kernel-dev-a4ec80082c82f3fda775d13b2a72aac38248ced6.zip
op-kernel-dev-a4ec80082c82f3fda775d13b2a72aac38248ced6.tar.gz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
Resolve conflict between commit 264640fc2c5f4f ("ipv6: distinguish frag queues by device for multicast and link-local packets") from the net tree and commit 029f7f3b8701c ("netfilter: ipv6: nf_defrag: avoid/free clone operations") from the nf-next tree. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Conflicts: net/ipv6/netfilter/nf_conntrack_reasm.c
Diffstat (limited to 'net/bridge')
-rw-r--r--net/bridge/br_if.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index ec02f586..8d1d4a2 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -493,7 +493,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
dev->priv_flags |= IFF_BRIDGE_PORT;
- err = netdev_master_upper_dev_link(dev, br->dev);
+ err = netdev_master_upper_dev_link(dev, br->dev, NULL, NULL);
if (err)
goto err5;
OpenPOWER on IntegriCloud