diff options
| author | Miri Korenblit <miriam.rachel.korenblit@intel.com> | 2024-03-03 09:40:39 +0200 |
|---|---|---|
| committer | iwlwifi publisher <> | 2024-04-17 13:04:44 +0000 |
| commit | 985150d64ea46f7c0e0efe9ffe6b3358c91191d1 (patch) | |
| tree | 6efb783ecc05a0401292f762f7747d16771c1573 | |
| parent | 581fb28a905f691d1d63c2c8461f3325cbbbcb8b (diff) | |
| download | backport-iwlwifi-985150d64ea46f7c0e0efe9ffe6b3358c91191d1.tar.gz | |
[BUGFIX] wifi: iwlwifi: mvm: don't always unblock EMLSR
When an event occurs to unblock EMLSR, the code attempts to re-enable
EMLSR. However, the current implementation always tries to activate
EMLSR, regardless of whether the blocker was set before the unblocking
event or not. If EMLSR was already unblocked, there is no need to
re-activate it.
type=bugfix
ticket=none
fixes=I552926065521f5f848c37b0bd845494bd7865fb7
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Change-Id: I6a1d9f774f5551cfab60ea37b71a62640496af9b
Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/97069
tested: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
automatic-review: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Tested-by: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
x-iwlwifi-stack-dev: 4f1134ef5e19536e18d0b1d08e56161aa0828cf9
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/link.c | 8 | ||||
| -rw-r--r-- | versions | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/link.c b/drivers/net/wireless/intel/iwlwifi/mvm/link.c index cdb4b84fa0..b91b3dd1f4 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/link.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/link.c @@ -953,9 +953,11 @@ void iwl_mvm_unblock_esr(struct iwl_mvm *mvm, struct ieee80211_vif *vif, if (WARN_ON(!(reason & IWL_MVM_BLOCK_ESR_REASONS))) return; - if (mvmvif->esr_disable_reason & reason) - IWL_DEBUG_INFO(mvm, "Unblocking EMSLR mode. reason = 0x%x\n", - reason); + /* No Change */ + if (!(mvmvif->esr_disable_reason & reason)) + return; + + IWL_DEBUG_INFO(mvm, "Unblocking EMSLR mode. reason = 0x%x\n", reason); mvmvif->esr_disable_reason &= ~reason; @@ -2,4 +2,4 @@ BACKPORTS_VERSION="(see git)" BACKPORTED_KERNEL_VERSION="(see git)" BACKPORTED_KERNEL_NAME="iwlwifi" BACKPORTS_BUILD_TSTAMP=__DATE__ \" \" __TIME__ -BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11972:baf50871" +BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11973:4f1134ef" |