summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiri Korenblit <miriam.rachel.korenblit@intel.com>2024-02-21 18:16:10 +0200
committeriwlwifi publisher <>2024-04-17 12:57:19 +0000
commitb75330955be70ad500161f2626e7a4a0db5c1d11 (patch)
tree8010d18225d1d2835a9a40d7e0c66e5b896cace0
parentcf13771ddba2df5eab088a89d91b213330df183c (diff)
downloadbackport-iwlwifi-b75330955be70ad500161f2626e7a4a0db5c1d11.tar.gz
[BUGFIX] wifi: iwlwifi: mvm: fix printing format
The current code is printing the esr exit/blocking reasons as a decimal value, instead of the hex value. Fix this. Also change iwl_mvm_esr_state flags to be hex values. type=bugfix ticket=none fixes=I552926065521f5f848c37b0bd845494bd7865fb7 Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com> Change-Id: I67ec6b429471d0cc7de85b9bd326acb9f65a945d Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/95670 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> x-iwlwifi-stack-dev: c9feb99f0341df658003906eddc3f368ecdcdf86
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mvm/link.c6
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mvm/mvm.h2
-rw-r--r--versions2
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/link.c b/drivers/net/wireless/intel/iwlwifi/mvm/link.c
index 07c0ff4014..b796a3aeec 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/link.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/link.c
@@ -710,7 +710,7 @@ void iwl_mvm_exit_esr(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
new_active_links = BIT(link_to_keep);
IWL_DEBUG_INFO(mvm,
- "Exiting EMLSR. Reason = %d. Current active links=0x%x, new active links = 0x%x\n",
+ "Exiting EMLSR. Reason = 0x%x. Current active links=0x%x, new active links = 0x%x\n",
reason, vif->active_links, new_active_links);
ieee80211_set_active_links_async(vif, new_active_links);
@@ -731,7 +731,7 @@ void iwl_mvm_block_esr(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
return;
if (!(mvmvif->esr_disable_reason & reason))
- IWL_DEBUG_INFO(mvm, "Blocking EMSLR mode. reason = %d\n",
+ IWL_DEBUG_INFO(mvm, "Blocking EMSLR mode. reason = 0x%x\n",
reason);
mvmvif->esr_disable_reason |= reason;
@@ -751,7 +751,7 @@ void iwl_mvm_unblock_esr(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
return;
if (mvmvif->esr_disable_reason & reason)
- IWL_DEBUG_INFO(mvm, "Unblocking EMSLR mode. reason = %d\n",
+ IWL_DEBUG_INFO(mvm, "Unblocking EMSLR mode. reason = 0x%x\n",
reason);
mvmvif->esr_disable_reason &= ~reason;
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
index fdbd00c4fb..dfbe85f9c4 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
@@ -358,7 +358,7 @@ struct iwl_mvm_vif_link_info {
* @IWL_MVM_ESR_BLOCKED_COEX: COEX is preventing the enablement of EMLSR
*/
enum iwl_mvm_esr_state {
- IWL_MVM_ESR_BLOCKED_COEX = BIT(0),
+ IWL_MVM_ESR_BLOCKED_COEX = 0x1,
};
/**
diff --git a/versions b/versions
index 23203598ce..2a84fa8c32 100644
--- a/versions
+++ b/versions
@@ -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:11937:21de4715"
+BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11938:c9feb99f"