[PATCH net v2 3/4] net: dsa: motorcomm: Read the port PVID instead of bridge's

From: David Yang

Date: Mon Nov 16 2026 - 11:02:45 EST


The driver passed the bridge master to br_vlan_get_pvid(), returning the
bridge's own PVID (VID 1 by default) instead of the configured port's.
Query the PVID from dsa_port_to_bridge_port() instead.

Fixes: 186623f4aa72 ("net: dsa: yt921x: Add support for Motorcomm YT921x")
Signed-off-by: David Yang <mmyangfl@xxxxxxxxx>
---
drivers/net/dsa/motorcomm/chip.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/drivers/net/dsa/motorcomm/chip.c b/drivers/net/dsa/motorcomm/chip.c
index 863ebb6c3198..d84d863080ce 100644
--- a/drivers/net/dsa/motorcomm/chip.c
+++ b/drivers/net/dsa/motorcomm/chip.c
@@ -952,18 +952,18 @@ static int
yt921x_vlan_filtering(struct yt921x_priv *priv, int port, bool vlan_filtering)
{
struct dsa_port *dp = dsa_to_port(&priv->ds, port);
- struct net_device *bdev;
+ struct net_device *brport;
u16 pvid;
u32 mask;
u32 ctrl;
int res;

- bdev = dsa_port_bridge_dev_get(dp);
+ brport = dsa_port_to_bridge_port(dp);

- if (!bdev || !vlan_filtering)
+ if (!brport || !vlan_filtering)
pvid = YT921X_VID_UNWARE;
else
- br_vlan_get_pvid(bdev, &pvid);
+ br_vlan_get_pvid(brport, &pvid);
res = yt921x_port_set_pvid(priv, port, pvid);
if (res)
return res;
@@ -1102,16 +1102,16 @@ yt921x_dsa_port_vlan_del(struct dsa_switch *ds, int port,
mutex_lock(&priv->reg_lock);
do {
struct dsa_port *dp = dsa_to_port(ds, port);
- struct net_device *bdev;
+ struct net_device *brport;

res = yt921x_vlan_del(priv, port, vid);
if (res)
break;

- bdev = dsa_port_bridge_dev_get(dp);
- if (bdev) {
- br_vlan_get_pvid(bdev, &pvid);
- if (pvid == vid)
+ brport = dsa_port_to_bridge_port(dp);
+ if (brport) {
+ br_vlan_get_pvid(brport, &pvid);
+ if (!pvid)
res = yt921x_pvid_clear(priv, port);
}
} while (0);
@@ -1139,19 +1139,19 @@ yt921x_dsa_port_vlan_add(struct dsa_switch *ds, int port,
mutex_lock(&priv->reg_lock);
do {
struct dsa_port *dp = dsa_to_port(ds, port);
- struct net_device *bdev;
+ struct net_device *brport;

res = yt921x_vlan_add(priv, port, vid,
vlan->flags & BRIDGE_VLAN_INFO_UNTAGGED);
if (res)
break;

- bdev = dsa_port_bridge_dev_get(dp);
- if (bdev) {
+ brport = dsa_port_to_bridge_port(dp);
+ if (brport) {
if (vlan->flags & BRIDGE_VLAN_INFO_PVID) {
res = yt921x_pvid_set(priv, port, vid);
} else {
- br_vlan_get_pvid(bdev, &pvid);
+ br_vlan_get_pvid(brport, &pvid);
if (pvid == vid)
res = yt921x_pvid_clear(priv, port);
}
--
2.53.0