diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2019-02-15 12:16:53 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-02-15 20:37:54 -0800 |
| commit | 10163aaee9671b01b2f4737922e1a4f43581047a (patch) | |
| tree | 8b31143303d9db45441ea219f8fbcf10b272f6a4 | |
| parent | c3152ec4c0691e351f35a2f63347a464b5f35151 (diff) | |
| download | linux-stable-10163aaee9671b01b2f4737922e1a4f43581047a.tar.gz linux-stable-10163aaee9671b01b2f4737922e1a4f43581047a.tar.bz2 linux-stable-10163aaee9671b01b2f4737922e1a4f43581047a.zip | |
net: dsa: b53: Do not program CPU port's PVID
The CPU port is special and does not need to obey VLAN restrictions as
far as untagged traffic goes, also, having the CPU port be part of a
particular PVID is against the idea of keeping it tagged in all VLANs.
Fixes: ca8931948344 ("net: dsa: b53: Keep CPU port as tagged in all VLANs")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/dsa/b53/b53_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c index 2fef4c564420..c76892ac4e69 100644 --- a/drivers/net/dsa/b53/b53_common.c +++ b/drivers/net/dsa/b53/b53_common.c @@ -1359,7 +1359,7 @@ void b53_vlan_add(struct dsa_switch *ds, int port, b53_fast_age_vlan(dev, vid); } - if (pvid) { + if (pvid && !dsa_is_cpu_port(ds, port)) { b53_write16(dev, B53_VLAN_PAGE, B53_VLAN_PORT_DEF_TAG(port), vlan->vid_end); b53_fast_age_vlan(dev, vid); |