From: Greg Kroah-Hartman Date: Tue, 16 Jun 2026 03:26:57 +0000 (+0530) Subject: 7.0-stable patches X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5f134f8ad3f13ec49704e6d1ff486bafcd2f1749;p=thirdparty%2Fkernel%2Fstable-queue.git 7.0-stable patches added patches: wifi-mac80211-skip-ieee80211_verify_sta_ht_mcs_support-check-in-non-strict-mode.patch wifi-mac80211-tests-mark-ht-check-strict.patch --- diff --git a/queue-7.0/series b/queue-7.0/series index f7b57e4652..3fa7d2dda6 100644 --- a/queue-7.0/series +++ b/queue-7.0/series @@ -362,3 +362,5 @@ driver-core-reject-devices-with-unregistered-buses.patch rdma-during-rereg_mr-ensure-that-rereg_access-is-compatible.patch netfilter-nft_fib-fix-stale-stack-leak-via-the-oifname-register.patch sched_ext-don-t-warn-on-null-cgrp_moving_from-in-scx_cgroup_move_task.patch +wifi-mac80211-skip-ieee80211_verify_sta_ht_mcs_support-check-in-non-strict-mode.patch +wifi-mac80211-tests-mark-ht-check-strict.patch diff --git a/queue-7.0/wifi-mac80211-skip-ieee80211_verify_sta_ht_mcs_support-check-in-non-strict-mode.patch b/queue-7.0/wifi-mac80211-skip-ieee80211_verify_sta_ht_mcs_support-check-in-non-strict-mode.patch new file mode 100644 index 0000000000..2a3c604768 --- /dev/null +++ b/queue-7.0/wifi-mac80211-skip-ieee80211_verify_sta_ht_mcs_support-check-in-non-strict-mode.patch @@ -0,0 +1,42 @@ +From 711a9c018ad252b2807f85d44e1267b595644f9b Mon Sep 17 00:00:00 2001 +From: Rio Liu +Date: Wed, 15 Apr 2026 16:57:13 +0000 +Subject: wifi: mac80211: skip ieee80211_verify_sta_ht_mcs_support check in non-strict mode + +From: Rio Liu + +commit 711a9c018ad252b2807f85d44e1267b595644f9b upstream. + +Some Xfinity XB8 firmware advertises >1 spatial stream MCS indexes in +their basic HT-MCS set. On cards with lower spatial streams, the check +would fail, and we'd be stuck with no HT when in fact work fine with its +own supported rate. This change makes it so the check is only performed +in strict mode. + +Fixes: 574faa0e936d ("wifi: mac80211: add HT and VHT basic set verification") +Signed-off-by: Rio Liu +Link: https://patch.msgid.link/99Mv9QEceyPrQhSP52MtAVmz0_kWJmzqotJjD9YW6LGLqk-AZloAueUyHCURilFkuqOh6Ecv8i2KKdSE1ujP3AnbU5QEouVisT1w_V3xdfc=@r26.me +Signed-off-by: Johannes Berg +Signed-off-by: Greg Kroah-Hartman +--- + net/mac80211/mlme.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +--- a/net/mac80211/mlme.c ++++ b/net/mac80211/mlme.c +@@ -420,6 +420,15 @@ ieee80211_verify_sta_ht_mcs_support(stru + ieee80211_apply_htcap_overrides(sdata, &sta_ht_cap); + + /* ++ * Some Xfinity XB8 firmware advertises >1 spatial stream MCS indexes in ++ * their basic HT-MCS set. On cards with lower spatial streams, the check ++ * would fail, and we'd be stuck with no HT when it in fact work fine with ++ * its own supported rate. So check it only in strict mode. ++ */ ++ if (!ieee80211_hw_check(&sdata->local->hw, STRICT)) ++ return true; ++ ++ /* + * P802.11REVme/D7.0 - 6.5.4.2.4 + * ... + * If the MLME of an HT STA receives an MLME-JOIN.request primitive diff --git a/queue-7.0/wifi-mac80211-tests-mark-ht-check-strict.patch b/queue-7.0/wifi-mac80211-tests-mark-ht-check-strict.patch new file mode 100644 index 0000000000..bb4ea31c8b --- /dev/null +++ b/queue-7.0/wifi-mac80211-tests-mark-ht-check-strict.patch @@ -0,0 +1,29 @@ +From 0cfff13c94cb5fa818bb374945ff280e08dc1bb9 Mon Sep 17 00:00:00 2001 +From: Johannes Berg +Date: Mon, 4 May 2026 08:54:27 +0200 +Subject: wifi: mac80211: tests: mark HT check strict + +From: Johannes Berg + +commit 0cfff13c94cb5fa818bb374945ff280e08dc1bb9 upstream. + +The HT check now only applies in strict mode since APs +were found to be broken. Mark it as such. + +Fixes: 711a9c018ad2 ("wifi: mac80211: skip ieee80211_verify_sta_ht_mcs_support check in non-strict mode") +Signed-off-by: Johannes Berg +Signed-off-by: Greg Kroah-Hartman +--- + net/mac80211/tests/chan-mode.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/net/mac80211/tests/chan-mode.c ++++ b/net/mac80211/tests/chan-mode.c +@@ -65,6 +65,7 @@ static const struct determine_chan_mode_ + .ht_capa_mask = { + .mcs.rx_mask[0] = 0xf7, + }, ++ .strict = true, + }, { + .desc = "Masking out a RX rate in VHT capabilities", + .conn_mode = IEEE80211_CONN_MODE_EHT,