diff options
| author | Miri Korenblit <miriam.rachel.korenblit@intel.com> | 2024-03-12 22:00:47 +0200 |
|---|---|---|
| committer | iwlwifi publisher <> | 2024-04-17 13:38:11 +0000 |
| commit | fb77dfad7066cf0251157b388efd6fdc1d78f99d (patch) | |
| tree | a53f65bedcd6d36416b354ca8be889eb9527606d | |
| parent | 82e8614424d0959312f321dd321e7636bcb3c54d (diff) | |
| download | backport-iwlwifi-fb77dfad7066cf0251157b388efd6fdc1d78f99d.tar.gz | |
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.
type=feature
ticket=none
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Change-Id: I46fd578a3ef6cdbf14fdc4dfa97b4be008fe68e3
Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/98860
automatic-review: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
tested: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/99437
Reviewed-by: Golan Ben Ami <golan.ben.ami@intel.com>
x-iwlwifi-stack-dev: 1fef99c607af59ad867b71e1c87cd624bafab1ad
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/link.c | 9 | ||||
| -rw-r--r-- | versions | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/link.c b/drivers/net/wireless/intel/iwlwifi/mvm/link.c index ed67b4d6d2..b0cc919afd 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/link.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/link.c @@ -962,6 +962,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; @@ -1009,6 +1012,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; @@ -1067,6 +1073,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; @@ -2,5 +2,5 @@ BACKPORTS_VERSION="(see git)" BACKPORTED_KERNEL_VERSION="(see git)" BACKPORTED_KERNEL_NAME="iwlwifi" BACKPORTS_BUILD_TSTAMP=__DATE__ \" \" __TIME__ -BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:release/core87:12026:b513ef49" +BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:release/core87:12027:1fef99c6" BACKPORTS_BRANCH_TSTAMP="Apr 17 2024 13:11:40" |