From: Gilles DOFFE <gilles.doffe@savoirfairelinux.com>
To: netdev@vger.kernel.org
Cc: Woojung Huh <woojung.huh@microchip.com>,
UNGLinuxDriver@microchip.com, Andrew Lunn <andrew@lunn.ch>,
Vivien Didelot <vivien.didelot@gmail.com>,
Florian Fainelli <f.fainelli@gmail.com>,
Vladimir Oltean <olteanv@gmail.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
linux-kernel@vger.kernel.org
Subject: [PATCH net 5/6] net: dsa: ksz: fix wrong pvid
Date: Wed, 13 Jan 2021 13:45:21 +0100 [thread overview]
Message-ID: <4d34da2534c912e290d77d4296a4aa68229fd6e6.1610540603.git.gilles.doffe@savoirfairelinux.com> (raw)
In-Reply-To: <cover.1610540603.git.gilles.doffe@savoirfairelinux.com>
A logical 'or' was performed until now.
So if vlan 1 is the current pvid and vlan 20 is set as the new one,
vlan 21 is the new pvid.
This commit fixes this by setting the right mask to set the new pvid.
Signed-off-by: Gilles DOFFE <gilles.doffe@savoirfairelinux.com>
---
drivers/net/dsa/microchip/ksz8795.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/dsa/microchip/ksz8795.c b/drivers/net/dsa/microchip/ksz8795.c
index b55fb2761993..44306a7e297a 100644
--- a/drivers/net/dsa/microchip/ksz8795.c
+++ b/drivers/net/dsa/microchip/ksz8795.c
@@ -868,8 +868,8 @@ static void ksz8795_port_vlan_add(struct dsa_switch *ds, int port,
if (new_pvid) {
ksz_pread16(dev, port, REG_PORT_CTRL_VID, &vid);
- vid &= 0xfff;
- vid |= new_pvid;
+ vid &= ~0xfff;
+ vid |= (new_pvid & 0xfff);
ksz_pwrite16(dev, port, REG_PORT_CTRL_VID, vid);
}
--
2.25.1
next prev parent reply other threads:[~2021-01-13 12:56 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-13 12:45 [PATCH net 0/6] Fixes on Microchip KSZ8795 DSA switch driver Gilles DOFFE
2021-01-13 12:45 ` [PATCH net 1/6] net: dsa: ksz: fix FID management Gilles DOFFE
2021-01-13 14:01 ` Gilles Doffe
2021-01-13 23:26 ` Vladimir Oltean
2021-01-13 12:45 ` [PATCH net 2/6] net: dsa: ksz: move tag/untag action Gilles DOFFE
2021-01-13 23:35 ` Florian Fainelli
2021-01-14 0:00 ` Vladimir Oltean
2021-01-13 12:45 ` [PATCH net 3/6] net: dsa: ksz: insert tag on ks8795 ingress packets Gilles DOFFE
2021-01-13 23:41 ` Florian Fainelli
2021-01-14 0:10 ` Vladimir Oltean
2021-01-13 12:45 ` [PATCH net 4/6] net: dsa: ksz: do not change tagging on del Gilles DOFFE
2021-01-13 23:48 ` Florian Fainelli
2021-01-14 0:15 ` Vladimir Oltean
2021-01-13 12:45 ` Gilles DOFFE [this message]
2021-01-13 17:23 ` [PATCH net 5/6] net: dsa: ksz: fix wrong pvid Florian Fainelli
2021-01-13 23:54 ` Vladimir Oltean
2021-01-13 12:45 ` [PATCH net 6/6] net: dsa: ksz: fix wrong read cast to u64 Gilles DOFFE
2021-01-13 23:39 ` Vladimir Oltean
2021-01-14 0:26 ` [PATCH net 0/6] Fixes on Microchip KSZ8795 DSA switch driver Vladimir Oltean
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=4d34da2534c912e290d77d4296a4aa68229fd6e6.1610540603.git.gilles.doffe@savoirfairelinux.com \
--to=gilles.doffe@savoirfairelinux.com \
--cc=UNGLinuxDriver@microchip.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=olteanv@gmail.com \
--cc=vivien.didelot@gmail.com \
--cc=woojung.huh@microchip.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;
as well as URLs for NNTP newsgroup(s).