aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-5.10/768-v5.15-net-dsa-mt7530-set-STP-state-on-filter-ID-1.patch
diff options
context:
space:
mode:
authorStijn Tintel <stijn@linux-ipv6.be>2022-04-03 19:08:45 +0300
committerPetr Štetiar <ynezz@true.cz>2022-04-19 14:52:49 +0200
commitf029912c07c177ae523c4b3ee86fbe4d3889788c (patch)
tree2d074584a1d05279cd55badce589793e7a017424 /target/linux/generic/backport-5.10/768-v5.15-net-dsa-mt7530-set-STP-state-on-filter-ID-1.patch
parentad5a507df3de951ca8c87656f3bc7bda647ae4d3 (diff)
downloadupstream-f029912c07c177ae523c4b3ee86fbe4d3889788c.tar.gz
upstream-f029912c07c177ae523c4b3ee86fbe4d3889788c.tar.bz2
upstream-f029912c07c177ae523c4b3ee86fbe4d3889788c.zip
Revert "kernel: backport MT7530 VLAN fix"
There are various reports on Github and in the forum that this commit causes multiple problems. This reverts commit ee6ba216d8ba1b02154c287e64d709a8bc7b0054. Fixes: #9420 Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be> (cherry picked from commit 3e0daca6447c3d5b9eb6d24ecb8e52f256f385cc)
Diffstat (limited to 'target/linux/generic/backport-5.10/768-v5.15-net-dsa-mt7530-set-STP-state-on-filter-ID-1.patch')
-rw-r--r--target/linux/generic/backport-5.10/768-v5.15-net-dsa-mt7530-set-STP-state-on-filter-ID-1.patch40
1 files changed, 0 insertions, 40 deletions
diff --git a/target/linux/generic/backport-5.10/768-v5.15-net-dsa-mt7530-set-STP-state-on-filter-ID-1.patch b/target/linux/generic/backport-5.10/768-v5.15-net-dsa-mt7530-set-STP-state-on-filter-ID-1.patch
deleted file mode 100644
index 2c1958bd43..0000000000
--- a/target/linux/generic/backport-5.10/768-v5.15-net-dsa-mt7530-set-STP-state-on-filter-ID-1.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From c5ffcefcb40420528d04c63e7dfc88f2845c9831 Mon Sep 17 00:00:00 2001
-From: DENG Qingfang <dqfext@gmail.com>
-Date: Wed, 4 Aug 2021 00:04:03 +0800
-Subject: [PATCH] net: dsa: mt7530: set STP state on filter ID 1
-
-As filter ID 1 is the only one used for bridges, set STP state on it.
-
-Signed-off-by: DENG Qingfang <dqfext@gmail.com>
-Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- drivers/net/dsa/mt7530.c | 3 ++-
- drivers/net/dsa/mt7530.h | 4 ++--
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
---- a/drivers/net/dsa/mt7530.c
-+++ b/drivers/net/dsa/mt7530.c
-@@ -1131,7 +1131,8 @@ mt7530_stp_state_set(struct dsa_switch *
- break;
- }
-
-- mt7530_rmw(priv, MT7530_SSP_P(port), FID_PST_MASK, stp_state);
-+ mt7530_rmw(priv, MT7530_SSP_P(port), FID_PST_MASK(FID_BRIDGED),
-+ FID_PST(FID_BRIDGED, stp_state));
- }
-
- static int
---- a/drivers/net/dsa/mt7530.h
-+++ b/drivers/net/dsa/mt7530.h
-@@ -183,8 +183,8 @@ enum mt7530_vlan_egress_attr {
-
- /* Register for port STP state control */
- #define MT7530_SSP_P(x) (0x2000 + ((x) * 0x100))
--#define FID_PST(x) ((x) & 0x3)
--#define FID_PST_MASK FID_PST(0x3)
-+#define FID_PST(fid, state) (((state) & 0x3) << ((fid) * 2))
-+#define FID_PST_MASK(fid) FID_PST(fid, 0x3)
-
- enum mt7530_stp_state {
- MT7530_STP_DISABLED = 0,