Commit 9a8a37c1 authored by Miri Korenblit's avatar Miri Korenblit
Browse files

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: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250909061931.e15a7fa15c70.Ibb8636e826136c8c31931e77f5ffa853372b4301@changeid
parent 79c0faef

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

+8 −20
Original line number Diff line number Diff line
@@ -357,25 +357,14 @@ 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));
@@ -385,7 +374,6 @@ iwl_mld_vif_iter_emlsr_mode_notif(void *data, u8 *mac, 
				   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));

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

+0 −1
Original line number Diff line number Diff line
@@ -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))