Skip to content

Commit 9a8a37c

Browse files
committed
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 <[email protected]> Signed-off-by: Miri Korenblit <[email protected]> Link: https://patch.msgid.link/20250909061931.e15a7fa15c70.Ibb8636e826136c8c31931e77f5ffa853372b4301@changeid
1 parent 79c0fae commit 9a8a37c

File tree

2 files changed

+8
-21
lines changed

2 files changed

+8
-21
lines changed

drivers/net/wireless/intel/iwlwifi/mld/mlo.c

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -357,38 +357,26 @@ iwl_mld_vif_iter_emlsr_mode_notif(void *data, u8 *mac,
357357
struct ieee80211_vif *vif)
358358
{
359359
const struct iwl_mld_vif *mld_vif = iwl_mld_vif_from_mac80211(vif);
360-
enum iwl_mvm_fw_esr_recommendation action;
361-
const struct iwl_esr_mode_notif *notif = NULL;
362-
363-
if (iwl_fw_lookup_notif_ver(mld_vif->mld->fw, DATA_PATH_GROUP,
364-
ESR_MODE_NOTIF, 0) > 1) {
365-
notif = (void *)data;
366-
action = le32_to_cpu(notif->action);
367-
} else {
368-
const struct iwl_esr_mode_notif_v1 *notif_v1 = (void *)data;
369-
370-
action = le32_to_cpu(notif_v1->action);
371-
}
360+
const struct iwl_esr_mode_notif *notif = (void *)data;
361+
enum iwl_mvm_fw_esr_recommendation action = le32_to_cpu(notif->action);
372362

373363
if (!iwl_mld_vif_has_emlsr_cap(vif))
374364
return;
375365

376366
switch (action) {
377367
case ESR_RECOMMEND_LEAVE:
378-
if (notif)
379-
IWL_DEBUG_INFO(mld_vif->mld,
380-
"FW recommend leave reason = 0x%x\n",
381-
le32_to_cpu(notif->leave_reason_mask));
368+
IWL_DEBUG_INFO(mld_vif->mld,
369+
"FW recommend leave reason = 0x%x\n",
370+
le32_to_cpu(notif->leave_reason_mask));
382371

383372
iwl_mld_exit_emlsr(mld_vif->mld, vif,
384373
IWL_MLD_EMLSR_EXIT_FW_REQUEST,
385374
iwl_mld_get_primary_link(vif));
386375
break;
387376
case ESR_FORCE_LEAVE:
388-
if (notif)
389-
IWL_DEBUG_INFO(mld_vif->mld,
390-
"FW force leave reason = 0x%x\n",
391-
le32_to_cpu(notif->leave_reason_mask));
377+
IWL_DEBUG_INFO(mld_vif->mld,
378+
"FW force leave reason = 0x%x\n",
379+
le32_to_cpu(notif->leave_reason_mask));
392380
fallthrough;
393381
case ESR_RECOMMEND_ENTER:
394382
default:

drivers/net/wireless/intel/iwlwifi/mld/notif.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,6 @@ CMD_VERSIONS(bt_coex_notif,
333333
CMD_VERSIONS(beacon_notification,
334334
CMD_VER_ENTRY(6, iwl_extended_beacon_notif))
335335
CMD_VERSIONS(emlsr_mode_notif,
336-
CMD_VER_ENTRY(1, iwl_esr_mode_notif_v1)
337336
CMD_VER_ENTRY(2, iwl_esr_mode_notif))
338337
CMD_VERSIONS(emlsr_trans_fail_notif,
339338
CMD_VER_ENTRY(1, iwl_esr_trans_fail_notif))

0 commit comments

Comments
 (0)