wifi: mac80211: skip ieee80211_verify_sta_ht_mcs_support check in non-strict mode

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>

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 160ae65a5c645819c437f8b70938e1055e547016..298ebff6bbf84bb3d5b0d2b3c4901fbf70ec9900 100644 (file)
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -437,6 +437,15 @@ ieee80211_verify_sta_ht_mcs_support(struct ieee80211_sub_if_data *sdata,
        memcpy(&sta_ht_cap, &sband->ht_cap, sizeof(sta_ht_cap));
        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
         * ...