wifi: iwlwifi: mvm: advertise MLO only if EHT is enabled

If 11ax/EHT is disabled, then we shouldn't advertise MLO
support either.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230816104355.ae4f9151440e.I6ce0b98d063d5005fd7a613454fcdb8b866a417a@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
index ce7905faa08ffd65bf22a2613ec7b9d64eff846f..e7fe5b76def4cc3605d8af8bf4a884159266696e 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
@@ -315,8 +315,9 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
        ieee80211_hw_set(hw, STA_MMPDU_TXQ);
 
        /* Set this early since we need to have it for the check below */
-       if (mvm->mld_api_is_used &&
-           mvm->trans->trans_cfg->device_family >= IWL_DEVICE_FAMILY_BZ)
+       if (mvm->mld_api_is_used && mvm->nvm_data->sku_cap_11be_enable &&
+           !iwlwifi_mod_params.disable_11ax &&
+           !iwlwifi_mod_params.disable_11be)
                hw->wiphy->flags |= WIPHY_FLAG_SUPPORTS_MLO;
 
        /* With MLD FW API, it tracks timing by itself,