wifi: iwlwifi: mvm: disable dynamic EMLSR when AUTO_EML is false

When AUTO_EML is set to false, this change ignores the exit criteria,
for testing purposes. Currently, if AUTO_EML is disabled, the
driver will not select a link or enter EMLSR, but will still exit if one
of the criteria is not fulfilled.

Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Link: https://msgid.link/20240512072733.10a0b5da6ec2.I46fd578a3ef6cdbf14fdc4dfa97b4be008fe68e3@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/link.c b/drivers/net/wireless/intel/iwlwifi/mvm/link.c
index 14dab617c0bdfc0959f3ee7e0a1016145326ea1c..fd8a21891d262abce7854e52074acebfacb264e7 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/link.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/link.c
@@ -966,6 +966,9 @@ void iwl_mvm_exit_esr(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
 
        lockdep_assert_held(&mvm->mutex);
 
+       if (!IWL_MVM_AUTO_EML_ENABLE)
+               return;
+
        /* Nothing to do */
        if (!mvmvif->esr_active)
                return;
@@ -1013,6 +1016,9 @@ void iwl_mvm_block_esr(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
 
        lockdep_assert_held(&mvm->mutex);
 
+       if (!IWL_MVM_AUTO_EML_ENABLE)
+               return;
+
        /* This should be called only with disable reasons */
        if (WARN_ON(!(reason & IWL_MVM_BLOCK_ESR_REASONS)))
                return;
@@ -1099,6 +1105,9 @@ void iwl_mvm_unblock_esr(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
 
        lockdep_assert_held(&mvm->mutex);
 
+       if (!IWL_MVM_AUTO_EML_ENABLE)
+               return;
+
        /* This should be called only with disable reasons */
        if (WARN_ON(!(reason & IWL_MVM_BLOCK_ESR_REASONS)))
                return;