diff options
| author | Nikolay Aleksandrov | 2015-09-30 20:16:55 +0200 |
|---|---|---|
| committer | David S. Miller | 2015-10-02 03:24:05 +0200 |
| commit | 248234ca029710fbad6423c48f98c2a6ea9582fb (patch) | |
| tree | 38d1c178777b62dec9eacea10a93d78dcaa7d24d /net/bridge/br_vlan.c | |
| parent | bridge: vlan: fix possible null ptr derefs on port init and deinit (diff) | |
| download | kernel-qcow2-linux-248234ca029710fbad6423c48f98c2a6ea9582fb.tar.gz kernel-qcow2-linux-248234ca029710fbad6423c48f98c2a6ea9582fb.tar.xz kernel-qcow2-linux-248234ca029710fbad6423c48f98c2a6ea9582fb.zip | |
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/bridge/br_vlan.c')
| -rw-r--r-- | net/bridge/br_vlan.c | 2 |
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); |