Commit 248234ca authored Sep 30, 2015 by Nikolay Aleksandrov Committed by David S. Miller Oct 01, 2015

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>

parent 263344e6

net/bridge/br_vlan.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);