summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorNikolay Aleksandrov <nikolay@cumulusnetworks.com>2015-09-30 21:16:55 +0300
committerDavid S. Miller <davem@davemloft.net>2015-10-02 04:24:05 +0300
commit248234ca029710fbad6423c48f98c2a6ea9582fb (patch)
tree38d1c178777b62dec9eacea10a93d78dcaa7d24d /net
parent263344e64c0a2ac0e409a1a3f27effb6d57b853e (diff)
downloadlinux-248234ca029710fbad6423c48f98c2a6ea9582fb.tar.xz
bridge: vlan: don't pass flags when creating context only
We should not pass the original flags when creating a context vlan only because they may contain some flags that change behaviour in the bridge. The new global context should be with minimal set of flags, so pass 0 and let br_vlan_add() set the master flag only. Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/bridge/br_vlan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c
index 7e9d60a402e2..75214a51cf0e 100644
--- a/net/bridge/br_vlan.c
+++ b/net/bridge/br_vlan.c
@@ -197,7 +197,7 @@ static int __vlan_add(struct net_bridge_vlan *v, u16 flags)
masterv = br_vlan_find(br->vlgrp, v->vid);
if (!masterv) {
/* missing global ctx, create it now */
- err = br_vlan_add(br, v->vid, master_flags);
+ err = br_vlan_add(br, v->vid, 0);
if (err)
goto out_filt;
masterv = br_vlan_find(br->vlgrp, v->vid);