From: David Yang <mmyangfl@gmail.com>
To: netdev@vger.kernel.org
Cc: David Yang <mmyangfl@gmail.com>, Andrew Lunn <andrew@lunn.ch>,
Vladimir Oltean <olteanv@gmail.com>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@kernel.org>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH net v2 3/4] net: dsa: motorcomm: Read the port PVID instead of bridge's
Date: Tue, 17 Nov 2026 00:01:03 +0800 [thread overview]
Message-ID: <20261116160107.1351198-4-mmyangfl@gmail.com> (raw)
In-Reply-To: <20261116160107.1351198-1-mmyangfl@gmail.com>
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@gmail.com>
---
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
next prev parent reply other threads:[~2026-11-16 16:02 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-16 16:01 [PATCH net v2 0/4] net: dsa: motorcomm: FDB fixup David Yang
2026-11-16 16:01 ` [PATCH net v2 1/4] net: dsa: motorcomm: Do not inherit ports from dynamic FDB entries David Yang
2026-11-16 16:01 ` [PATCH net v2 2/4] net: dsa: motorcomm: Rewrite FDB entry on port migration David Yang
2026-11-16 16:01 ` David Yang [this message]
2026-11-16 16:01 ` [PATCH net v2 4/4] net: dsa: motorcomm: Use VID 0 as the unaware PVID David Yang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261116160107.1351198-4-mmyangfl@gmail.com \
--to=mmyangfl@gmail.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=olteanv@gmail.com \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®