wifi: iwlwifi: mld: remove support of iwl_esr_mode_notif version 1

The last FW API that supports version 5 is 99. Since this API is no
longer supported on any device that loads iwlmld, we can remove support
of it.

Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250909061931.e15a7fa15c70.Ibb8636e826136c8c31931e77f5ffa853372b4301@changeid

diff --git a/drivers/net/wireless/intel/iwlwifi/mld/mlo.c b/drivers/net/wireless/intel/iwlwifi/mld/mlo.c
index 99a9219438a655982550e24db032a6240568d7ed..241a6271d13d6213e79ebb6ef0c6673753cee8dd 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mld/mlo.c
+++ b/drivers/net/wireless/intel/iwlwifi/mld/mlo.c
@@ -357,38 +357,26 @@ iwl_mld_vif_iter_emlsr_mode_notif(void *data, u8 *mac,
                                  struct ieee80211_vif *vif)
 {
        const struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);
-       enum iwl_mvm_fw_esr_recommendation action;
-       const struct iwl_esr_mode_notif *notif = NULL;
-
-       if (iwl_fw_lookup_notif_ver(mld_vif->mld->fw, DATA_PATH_GROUP,
-                                   ESR_MODE_NOTIF, 0) > 1) {
-               notif = (void *)data;
-               action = le32_to_cpu(notif->action);
-       } else {
-               const struct iwl_esr_mode_notif_v1 *notif_v1 = (void *)data;
-
-               action = le32_to_cpu(notif_v1->action);
-       }
+       const struct iwl_esr_mode_notif *notif = (void *)data;
+       enum iwl_mvm_fw_esr_recommendation action = le32_to_cpu(notif->action);
 
        if (!iwl_mld_vif_has_emlsr_cap(vif))
                return;
 
        switch (action) {
        case ESR_RECOMMEND_LEAVE:
-               if (notif)
-                       IWL_DEBUG_INFO(mld_vif->mld,
-                                      "FW recommend leave reason = 0x%x\n",
-                                      le32_to_cpu(notif->leave_reason_mask));
+               IWL_DEBUG_INFO(mld_vif->mld,
+                              "FW recommend leave reason = 0x%x\n",
+                              le32_to_cpu(notif->leave_reason_mask));
 
                iwl_mld_exit_emlsr(mld_vif->mld, vif,
                                   IWL_MLD_EMLSR_EXIT_FW_REQUEST,
                                   iwl_mld_get_primary_link(vif));
                break;
        case ESR_FORCE_LEAVE:
-               if (notif)
-                       IWL_DEBUG_INFO(mld_vif->mld,
-                                      "FW force leave reason = 0x%x\n",
-                                      le32_to_cpu(notif->leave_reason_mask));
+               IWL_DEBUG_INFO(mld_vif->mld,
+                              "FW force leave reason = 0x%x\n",
+                              le32_to_cpu(notif->leave_reason_mask));
                fallthrough;
        case ESR_RECOMMEND_ENTER:
        default:

diff --git a/drivers/net/wireless/intel/iwlwifi/mld/notif.c b/drivers/net/wireless/intel/iwlwifi/mld/notif.c
index f17aeca4fae674c8ceac4994d7675230c10c55cd..884973d0b34408152abf119aa8a38d3000e73bf0 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mld/notif.c
+++ b/drivers/net/wireless/intel/iwlwifi/mld/notif.c
@@ -333,7 +333,6 @@ CMD_VERSIONS(bt_coex_notif,
 CMD_VERSIONS(beacon_notification,
             CMD_VER_ENTRY(6, iwl_extended_beacon_notif))
 CMD_VERSIONS(emlsr_mode_notif,
-            CMD_VER_ENTRY(1, iwl_esr_mode_notif_v1)
             CMD_VER_ENTRY(2, iwl_esr_mode_notif))
 CMD_VERSIONS(emlsr_trans_fail_notif,
             CMD_VER_ENTRY(1, iwl_esr_trans_fail_notif))