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 4/6] net: dsa: ksz: do not change tagging on del
Date: Wed, 13 Jan 2021 13:45:20 +0100 [thread overview]
Message-ID: <c3effba30b2ae979a4b7990bbf6096ca26e3de7a.1610540603.git.gilles.doffe@savoirfairelinux.com> (raw)
In-Reply-To: <cover.1610540603.git.gilles.doffe@savoirfairelinux.com>
If a VLAN is removed, the tagging policy should not be changed as
still active VLANs could be impacted.
Signed-off-by: Gilles DOFFE <gilles.doffe@savoirfairelinux.com>
---
drivers/net/dsa/microchip/ksz8795.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/net/dsa/microchip/ksz8795.c b/drivers/net/dsa/microchip/ksz8795.c
index 193f03ef9160..b55fb2761993 100644
--- a/drivers/net/dsa/microchip/ksz8795.c
+++ b/drivers/net/dsa/microchip/ksz8795.c
@@ -880,7 +880,6 @@ static void ksz8795_port_vlan_add(struct dsa_switch *ds, int port,
static int ksz8795_port_vlan_del(struct dsa_switch *ds, int port,
const struct switchdev_obj_port_vlan *vlan)
{
- bool untagged = vlan->flags & BRIDGE_VLAN_INFO_UNTAGGED;
struct ksz_device *dev = ds->priv;
u16 data, vid, pvid, new_pvid = 0;
u8 fid, member, valid;
@@ -888,8 +887,6 @@ static int ksz8795_port_vlan_del(struct dsa_switch *ds, int port,
ksz_pread16(dev, port, REG_PORT_CTRL_VID, &pvid);
pvid = pvid & 0xFFF;
- ksz_port_cfg(dev, port, P_TAG_CTRL, PORT_REMOVE_TAG, untagged);
-
for (vid = vlan->vid_begin; vid <= vlan->vid_end; vid++) {
ksz8795_r_vlan_table(dev, vid, &data);
ksz8795_from_vlan(data, &fid, &member, &valid);
--
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 ` Gilles DOFFE [this message]
2021-01-13 23:48 ` [PATCH net 4/6] net: dsa: ksz: do not change tagging on del Florian Fainelli
2021-01-14 0:15 ` Vladimir Oltean
2021-01-13 12:45 ` [PATCH net 5/6] net: dsa: ksz: fix wrong pvid Gilles DOFFE
2021-01-13 17:23 ` 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=c3effba30b2ae979a4b7990bbf6096ca26e3de7a.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).