summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiri Korenblit <miriam.rachel.korenblit@intel.com>2024-03-18 18:23:52 +0200
committeriwlwifi publisher <>2024-04-17 13:39:02 +0000
commit3d42f95cc4b8f2dd8ec7c13efd063579fabd2d43 (patch)
tree97804592b7ee508000ce19a960537e3bb04c5263
parentd45c5968fd7458ec49328dfec6f53a4a13b18a70 (diff)
downloadbackport-iwlwifi-3d42f95cc4b8f2dd8ec7c13efd063579fabd2d43.tar.gz
[BUGFIX] wifi: iwlwifi: mvm: fix resetting the MPDU counters
The wrong size is used in the memset(), so only the counter of the first link is zeroed. Fix that type=bugfix ticket=jira:WIFI-397279 fixes=If9eb946e929a39e10fe5f4638bc8bc3f8976edf1 Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com> Change-Id: I7bc97c37c4fd2b10a86b1cd711578136e72aa884 Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/99866 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> Tested-by: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM> (cherry picked from commit 5ba1c81c26e0ac3b340098dc234496481e390cd4) Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/99830 x-iwlwifi-stack-dev: d8de0c749605cb90bf699aaf9a6c16550ca776cc
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mvm/rx.c2
-rw-r--r--versions2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rx.c b/drivers/net/wireless/intel/iwlwifi/mvm/rx.c
index dfc697aa32..0194e54e1b 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/rx.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rx.c
@@ -995,7 +995,7 @@ static void iwl_mvm_update_esr_mode_tpt(struct iwl_mvm *mvm)
*/
if (mvmvif->esr_active)
memset(mvmsta->mpdu_counters[q].per_link, 0,
- sizeof(struct iwl_mvm_mpdu_counter));
+ sizeof(mvmsta->mpdu_counters[q].per_link));
spin_unlock_bh(&mvmsta->mpdu_counters[q].lock);
}
diff --git a/versions b/versions
index a2b87b4854..e5dc49d237 100644
--- a/versions
+++ b/versions
@@ -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:12031:72497549"
+BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:release/core87:12032:d8de0c74"
BACKPORTS_BRANCH_TSTAMP="Apr 17 2024 13:11:40"