6.18-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-6.18/series b/queue-6.18/series
index 7d568f769a9c7c8516abd63306c2e8ebef817edd..07dfc335fe1a4447616c17596346850128641048 100644 (file)
--- a/queue-6.18/series
+++ b/queue-6.18/series
@@ -303,3 +303,5 @@ drm-amd-display-fix-out-of-bounds-read-in-dp_get_eq_aux_rd_interval.patch
 drm-amd-display-use-krealloc_array-in-dal_vector_reserve.patch
 fs-fcntl-fix-softirq-unsafe-lock-order-in-fasync-signaling.patch
 driver-core-reject-devices-with-unregistered-buses.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-6.18/wifi-mac80211-skip-ieee80211_verify_sta_ht_mcs_support-check-in-non-strict-mode.patch b/queue-6.18/wifi-mac80211-skip-ieee80211_verify_sta_ht_mcs_support-check-in-non-strict-mode.patch
new file mode 100644 (file)
index 0000000..cfa400e
--- /dev/null
+++ b/queue-6.18/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 <rio@r26.me>
+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 <rio@r26.me>
+
+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 <rio@r26.me>
+Link: https://patch.msgid.link/99Mv9QEceyPrQhSP52MtAVmz0_kWJmzqotJjD9YW6LGLqk-AZloAueUyHCURilFkuqOh6Ecv8i2KKdSE1ujP3AnbU5QEouVisT1w_V3xdfc=@r26.me
+Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ net/mac80211/mlme.c |    9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+--- a/net/mac80211/mlme.c
++++ b/net/mac80211/mlme.c
+@@ -364,6 +364,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-6.18/wifi-mac80211-tests-mark-ht-check-strict.patch b/queue-6.18/wifi-mac80211-tests-mark-ht-check-strict.patch
new file mode 100644 (file)
index 0000000..bb4ea31
--- /dev/null
+++ b/queue-6.18/wifi-mac80211-tests-mark-ht-check-strict.patch
@@ -0,0 +1,29 @@
+From 0cfff13c94cb5fa818bb374945ff280e08dc1bb9 Mon Sep 17 00:00:00 2001
+From: Johannes Berg <johannes.berg@intel.com>
+Date: Mon, 4 May 2026 08:54:27 +0200
+Subject: wifi: mac80211: tests: mark HT check strict
+
+From: Johannes Berg <johannes.berg@intel.com>
+
+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 <johannes.berg@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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,