diff options
| author | David S. Miller <davem@davemloft.net> | 2018-10-06 14:43:42 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-10-06 14:43:42 -0700 |
| commit | 72438f8cef4e75a22140853baa4c68392c721b22 (patch) | |
| tree | 78b7b6dafd827e0d55150a227db3978d91c0b6dd /drivers/net/dsa/b53 | |
| parent | fb4ee67529ff3e4c5874768477887c2df5714c96 (diff) | |
| parent | c1d84a1b42ef70d8ae601df9cadedc7ed4f1beb1 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/dsa/b53')
| -rw-r--r-- | drivers/net/dsa/b53/b53_common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c index 700d86dd5e13..0e4bbdcc614f 100644 --- a/drivers/net/dsa/b53/b53_common.c +++ b/drivers/net/dsa/b53/b53_common.c @@ -1291,7 +1291,7 @@ void b53_vlan_add(struct dsa_switch *ds, int port, b53_get_vlan_entry(dev, vid, vl); vl->members |= BIT(port); - if (untagged) + if (untagged && !dsa_is_cpu_port(ds, port)) vl->untag |= BIT(port); else vl->untag &= ~BIT(port); @@ -1333,7 +1333,7 @@ int b53_vlan_del(struct dsa_switch *ds, int port, pvid = 0; } - if (untagged) + if (untagged && !dsa_is_cpu_port(ds, port)) vl->untag &= ~(BIT(port)); b53_set_vlan_entry(dev, vid, vl); |