From: Miri Korenblit <miriam.rachel.korenblit@xxxxxxxxx>
Enable the new FW API with MLD based on FW TLV.
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@xxxxxxxxx>
Signed-off-by: Gregory Greenman <gregory.greenman@xxxxxxxxx>
---
drivers/net/wireless/intel/iwlwifi/fw/file.h | 1 +
drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 20 ++------------------
2 files changed, 3 insertions(+), 18 deletions(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/file.h b/drivers/net/wireless/intel/iwlwifi/fw/file.h
index 34ef106a2274..b00174c9ebce 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/file.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/file.h
@@ -459,6 +459,7 @@ enum iwl_ucode_tlv_capa {
IWL_UCODE_TLV_CAPA_SYNCED_TIME = (__force iwl_ucode_tlv_capa_t)106,
IWL_UCODE_TLV_CAPA_TIME_SYNC_BOTH_FTM_TM = (__force iwl_ucode_tlv_capa_t)108,
IWL_UCODE_TLV_CAPA_BIGTK_TX_SUPPORT = (__force iwl_ucode_tlv_capa_t)109,
+ IWL_UCODE_TLV_CAPA_MLD_API_SUPPORT = (__force iwl_ucode_tlv_capa_t)110,
IWL_UCODE_TLV_CAPA_SCAN_DONT_TOGGLE_ANT = (__force iwl_ucode_tlv_capa_t)111,
#ifdef __CHECKER__
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
index 76ac8a480712..42e67df13a1e 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
@@ -1401,24 +1401,8 @@ static inline bool iwl_mvm_has_new_rx_api(struct iwl_mvm *mvm)
static inline bool iwl_mvm_has_mld_api(const struct iwl_fw *fw)
{
- return (iwl_fw_lookup_cmd_ver(fw, LINK_CONFIG_CMD,
- IWL_FW_CMD_VER_UNKNOWN) !=
- IWL_FW_CMD_VER_UNKNOWN) &&
- (iwl_fw_lookup_cmd_ver(fw, MAC_CONFIG_CMD,
- IWL_FW_CMD_VER_UNKNOWN) !=
- IWL_FW_CMD_VER_UNKNOWN) &&
- (iwl_fw_lookup_cmd_ver(fw, STA_CONFIG_CMD,
- IWL_FW_CMD_VER_UNKNOWN) !=
- IWL_FW_CMD_VER_UNKNOWN) &&
- (iwl_fw_lookup_cmd_ver(fw, AUX_STA_CMD,
- IWL_FW_CMD_VER_UNKNOWN) !=
- IWL_FW_CMD_VER_UNKNOWN) &&
- (iwl_fw_lookup_cmd_ver(fw, STA_REMOVE_CMD,
- IWL_FW_CMD_VER_UNKNOWN) !=
- IWL_FW_CMD_VER_UNKNOWN) &&
- (iwl_fw_lookup_cmd_ver(fw, STA_DISABLE_TX_CMD,
- IWL_FW_CMD_VER_UNKNOWN) !=
- IWL_FW_CMD_VER_UNKNOWN);
+ return fw_has_capa(&fw->ucode_capa,
+ IWL_UCODE_TLV_CAPA_MLD_API_SUPPORT);
}
static inline bool iwl_mvm_has_new_tx_api(struct iwl_mvm *mvm)
--
2.38.1
