From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Florian Fainelli <f.fainelli@gmail.com>,
"David S . Miller" <davem@davemloft.net>,
Sasha Levin <sashal@kernel.org>,
netdev@vger.kernel.org
Subject: [PATCH AUTOSEL 5.5 31/66] net: dsa: b53: Ensure the default VID is untagged
Date: Mon, 2 Mar 2020 21:45:40 -0500 [thread overview]
Message-ID: <20200303024615.8889-31-sashal@kernel.org> (raw)
In-Reply-To: <20200303024615.8889-1-sashal@kernel.org>
From: Florian Fainelli <f.fainelli@gmail.com>
[ Upstream commit d965a5432d4c3e6b9c3d2bc1d4a800013bbf76f6 ]
We need to ensure that the default VID is untagged otherwise the switch
will be sending tagged frames and the results can be problematic. This
is especially true with b53 switches that use VID 0 as their default
VLAN since VID 0 has a special meaning.
Fixes: fea83353177a ("net: dsa: b53: Fix default VLAN ID")
Fixes: 061f6a505ac3 ("net: dsa: Add ndo_vlan_rx_{add, kill}_vid implementation")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/net/dsa/b53/b53_common.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c
index 6a1ff4d43e3a6..38b16efda4a9f 100644
--- a/drivers/net/dsa/b53/b53_common.c
+++ b/drivers/net/dsa/b53/b53_common.c
@@ -1353,6 +1353,9 @@ void b53_vlan_add(struct dsa_switch *ds, int port,
b53_get_vlan_entry(dev, vid, vl);
+ if (vid == 0 && vid == b53_default_pvid(dev))
+ untagged = true;
+
vl->members |= BIT(port);
if (untagged && !dsa_is_cpu_port(ds, port))
vl->untag |= BIT(port);
--
2.20.1
next prev parent reply other threads:[~2020-03-03 3:01 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20200303024615.8889-1-sashal@kernel.org>
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 05/66] selftests: fix too long argument Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 19/66] selftests: forwarding: use proto icmp for {gretap, ip6gretap}_mac testing Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 20/66] net: macb: ensure interface is not suspended on at91rm9200 Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 21/66] selftests: forwarding: vxlan_bridge_1d: fix tos value Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 22/66] net: atlantic: checksum compat issue Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 23/66] net: atlantic: check rpc result and wait for rpc address Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 24/66] net: atlantic: ptp gpio adjustments Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 25/66] net: atlantic: better loopback mode handling Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 26/66] net: atlantic: fix use after free kasan warn Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 27/66] net: atlantic: fix potential error handling Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 28/66] net: atlantic: possible fault in transition to hibernation Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 29/66] net: atlantic: fix out of range usage of active_vlans array Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 30/66] net: phy: restore mdio regs in the iproc mdio driver Sasha Levin
2020-03-03 2:45 ` Sasha Levin [this message]
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 32/66] bonding: add missing netdev_update_lockdep_key() Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 33/66] net: ks8851-ml: Remove 8-bit bus accessors Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 34/66] net: ks8851-ml: Fix 16-bit data access Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 35/66] net: ks8851-ml: Fix 16-bit IO operation Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 36/66] net: ethernet: dm9000: Handle -EPROBE_DEFER in dm9000_parse_dt() Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 40/66] net: mscc: fix in frame extraction Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 42/66] qede: Fix race between rdma destroy workqueue and link change event Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 43/66] net/mlx5: DR, Fix matching on vport gvmi Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 50/66] nfc: pn544: Fix occasional HW initialization failure Sasha Levin
2020-03-03 2:46 ` [PATCH AUTOSEL 5.5 51/66] ice: Don't tell the OS that link is going down Sasha Levin
2020-03-03 2:46 ` [PATCH AUTOSEL 5.5 55/66] net: macb: Properly handle phylink on at91rm9200 Sasha Levin
2020-03-03 2:46 ` [PATCH AUTOSEL 5.5 56/66] ionic: fix fw_status read Sasha Levin
2020-03-03 2:46 ` [PATCH AUTOSEL 5.5 57/66] net: thunderx: workaround BGX TX Underflow issue Sasha Levin
2020-03-03 2:46 ` [PATCH AUTOSEL 5.5 58/66] bnxt_en: Improve device shutdown method Sasha Levin
2020-03-03 2:46 ` [PATCH AUTOSEL 5.5 59/66] bnxt_en: Issue PCIe FLR in kdump kernel to cleanup pending DMAs Sasha Levin
2020-03-03 2:46 ` [PATCH AUTOSEL 5.5 66/66] selftests: forwarding: vxlan_bridge_1d: use more proper tos value Sasha Levin
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=20200303024615.8889-31-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=stable@vger.kernel.org \
/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).