net: dsa: b53: Do not program CPU port's PVID

ffainelli · davem330 · commit 10163aaee967 · 2019-02-15T20:37:54.000-08:00
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: ca89319 ("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>
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -1359,7 +1359,7 @@ void b53_vlan_add(struct dsa_switch *ds, int port,`
`1359`	`1359`	`b53_fast_age_vlan(dev, vid);`
`1360`	`1360`	`}`
`1361`	`1361`
`1362`		`- if (pvid) {`
	`1362`	`+ if (pvid && !dsa_is_cpu_port(ds, port)) {`
`1363`	`1363`	`b53_write16(dev, B53_VLAN_PAGE, B53_VLAN_PORT_DEF_TAG(port),`
`1364`	`1364`	`vlan->vid_end);`
`1365`	`1365`	`b53_fast_age_vlan(dev, vid);`