]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
wifi: iwlwifi: mvm: don't send a 6E related command when not supported
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Tue, 24 Mar 2026 09:33:25 +0000 (11:33 +0200)
committerMiri Korenblit <miriam.rachel.korenblit@intel.com>
Tue, 24 Mar 2026 11:55:53 +0000 (13:55 +0200)
MCC_ALLOWED_AP_TYPE_CMD is related to 6E support. Do not send it if the
device doesn't support 6E.
Apparently, the firmware is mistakenly advertising support for this
command even on AX201 which does not support 6E and then the firmware
crashes.

Fixes: 0d2fc8821a7d ("wifi: iwlwifi: nvm: parse the VLP/AFC bit from regulatory")
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=220804
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20260324113316.e171f0163f2a.I0c444d1f82d1773054e7ffc391ad49697d58f44e@changeid
drivers/net/wireless/intel/iwlwifi/mvm/fw.c

index 43cf94c9a36bdfe773957b781727df861781a443..6cc78661116e5d74927a87d929bcc773da57befe 100644 (file)
@@ -470,7 +470,8 @@ static void iwl_mvm_uats_init(struct iwl_mvm *mvm)
                .dataflags[0] = IWL_HCMD_DFL_NOCOPY,
        };
 
-       if (mvm->trans->mac_cfg->device_family < IWL_DEVICE_FAMILY_AX210) {
+       if (mvm->trans->mac_cfg->device_family < IWL_DEVICE_FAMILY_AX210 ||
+           !mvm->trans->cfg->uhb_supported) {
                IWL_DEBUG_RADIO(mvm, "UATS feature is not supported\n");
                return;
        }