From 797731a6e3da3e14c48c5bb6ba068979d43c2579 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 1 May 2025 10:02:05 +0200 Subject: [PATCH] drop net-dsa-mt7530-sync-driver-specific-behavior-of-mt75.patch from 5.15 and 6.1 queues --- ...ync-driver-specific-behavior-of-mt75.patch | 57 ------------------- queue-5.15/series | 1 - ...ync-driver-specific-behavior-of-mt75.patch | 57 ------------------- queue-6.1/series | 1 - 4 files changed, 116 deletions(-) delete mode 100644 queue-5.15/net-dsa-mt7530-sync-driver-specific-behavior-of-mt75.patch delete mode 100644 queue-6.1/net-dsa-mt7530-sync-driver-specific-behavior-of-mt75.patch diff --git a/queue-5.15/net-dsa-mt7530-sync-driver-specific-behavior-of-mt75.patch b/queue-5.15/net-dsa-mt7530-sync-driver-specific-behavior-of-mt75.patch deleted file mode 100644 index 8289839534..0000000000 --- a/queue-5.15/net-dsa-mt7530-sync-driver-specific-behavior-of-mt75.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 76061f8b0ed8a1fe09f31ad5fe5be0e10245cd5c Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 22 Apr 2025 04:10:20 +0100 -Subject: net: dsa: mt7530: sync driver-specific behavior of MT7531 variants - -From: Daniel Golle - -[ Upstream commit 497041d763016c2e8314d2f6a329a9b77c3797ca ] - -MT7531 standalone and MMIO variants found in MT7988 and EN7581 share -most basic properties. Despite that, assisted_learning_on_cpu_port and -mtu_enforcement_ingress were only applied for MT7531 but not for MT7988 -or EN7581, causing the expected issues on MMIO devices. - -Apply both settings equally also for MT7988 and EN7581 by moving both -assignments form mt7531_setup() to mt7531_setup_common(). - -This fixes unwanted flooding of packets due to unknown unicast -during DA lookup, as well as issues with heterogenous MTU settings. - -Fixes: 7f54cc9772ce ("net: dsa: mt7530: split-off common parts from mt7531_setup") -Signed-off-by: Daniel Golle -Reviewed-by: Chester A. Unal -Link: https://patch.msgid.link/89ed7ec6d4fa0395ac53ad2809742bb1ce61ed12.1745290867.git.daniel@makrotopia.org -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/dsa/mt7530.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c -index 86db6a18c8377..abd61514d3361 100644 ---- a/drivers/net/dsa/mt7530.c -+++ b/drivers/net/dsa/mt7530.c -@@ -2534,6 +2534,9 @@ mt7531_setup_common(struct dsa_switch *ds) - struct mt7530_priv *priv = ds->priv; - int ret, i; - -+ ds->assisted_learning_on_cpu_port = true; -+ ds->mtu_enforcement_ingress = true; -+ - mt753x_trap_frames(priv); - - /* Enable and reset MIB counters */ -@@ -2673,9 +2676,6 @@ mt7531_setup(struct dsa_switch *ds) - if (ret) - return ret; - -- ds->assisted_learning_on_cpu_port = true; -- ds->mtu_enforcement_ingress = true; -- - return 0; - } - --- -2.39.5 - diff --git a/queue-5.15/series b/queue-5.15/series index 6ac97a65ac..7fc1d20589 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -291,7 +291,6 @@ net-phy-leds-fix-memory-leak.patch tipc-fix-null-pointer-dereference-in-tipc_mon_reinit.patch net_sched-hfsc-fix-a-uaf-vulnerability-in-class-hand.patch net_sched-hfsc-fix-a-potential-uaf-in-hfsc_dequeue-t.patch -net-dsa-mt7530-sync-driver-specific-behavior-of-mt75.patch iommu-amd-return-an-error-if-vcpu-affinity-is-set-fo.patch virtio_console-fix-missing-byte-order-handling-for-cols-and-rows.patch net-selftests-initialize-tcp-header-and-skb-payload-with-zero.patch diff --git a/queue-6.1/net-dsa-mt7530-sync-driver-specific-behavior-of-mt75.patch b/queue-6.1/net-dsa-mt7530-sync-driver-specific-behavior-of-mt75.patch deleted file mode 100644 index db8ad8a229..0000000000 --- a/queue-6.1/net-dsa-mt7530-sync-driver-specific-behavior-of-mt75.patch +++ /dev/null @@ -1,57 +0,0 @@ -From c47082a8b43874c46e044fe76615b6c247164468 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 22 Apr 2025 04:10:20 +0100 -Subject: net: dsa: mt7530: sync driver-specific behavior of MT7531 variants - -From: Daniel Golle - -[ Upstream commit 497041d763016c2e8314d2f6a329a9b77c3797ca ] - -MT7531 standalone and MMIO variants found in MT7988 and EN7581 share -most basic properties. Despite that, assisted_learning_on_cpu_port and -mtu_enforcement_ingress were only applied for MT7531 but not for MT7988 -or EN7581, causing the expected issues on MMIO devices. - -Apply both settings equally also for MT7988 and EN7581 by moving both -assignments form mt7531_setup() to mt7531_setup_common(). - -This fixes unwanted flooding of packets due to unknown unicast -during DA lookup, as well as issues with heterogenous MTU settings. - -Fixes: 7f54cc9772ce ("net: dsa: mt7530: split-off common parts from mt7531_setup") -Signed-off-by: Daniel Golle -Reviewed-by: Chester A. Unal -Link: https://patch.msgid.link/89ed7ec6d4fa0395ac53ad2809742bb1ce61ed12.1745290867.git.daniel@makrotopia.org -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/dsa/mt7530.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c -index 1aba0cf38630f..308e56a73df01 100644 ---- a/drivers/net/dsa/mt7530.c -+++ b/drivers/net/dsa/mt7530.c -@@ -2558,6 +2558,9 @@ mt7531_setup_common(struct dsa_switch *ds) - struct mt7530_priv *priv = ds->priv; - int ret, i; - -+ ds->assisted_learning_on_cpu_port = true; -+ ds->mtu_enforcement_ingress = true; -+ - mt753x_trap_frames(priv); - - /* Enable and reset MIB counters */ -@@ -2701,9 +2704,6 @@ mt7531_setup(struct dsa_switch *ds) - if (ret) - return ret; - -- ds->assisted_learning_on_cpu_port = true; -- ds->mtu_enforcement_ingress = true; -- - return 0; - } - --- -2.39.5 - diff --git a/queue-6.1/series b/queue-6.1/series index 71327d50dd..03ea7d92a3 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -44,7 +44,6 @@ net-phy-leds-fix-memory-leak.patch tipc-fix-null-pointer-dereference-in-tipc_mon_reinit.patch net_sched-hfsc-fix-a-uaf-vulnerability-in-class-hand.patch net_sched-hfsc-fix-a-potential-uaf-in-hfsc_dequeue-t.patch -net-dsa-mt7530-sync-driver-specific-behavior-of-mt75.patch iommu-amd-return-an-error-if-vcpu-affinity-is-set-fo.patch perf-x86-fix-non-sampling-counting-events-on-certain.patch loongarch-select-arch_use_memtest.patch -- 2.47.3