summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Berg <benjamin.berg@intel.com>2024-03-08 08:15:23 +0100
committeriwlwifi publisher <>2024-04-17 13:10:08 +0000
commit2f2c005cde1ee723b074f1a6f5ad5ac83ce42b27 (patch)
treec974dd263645daf3ec516fd3707d5a9bb06a6d2c
parent9845ec3229bbe0bb42d14e5091d15715c9fc9cf3 (diff)
downloadbackport-iwlwifi-2f2c005cde1ee723b074f1a6f5ad5ac83ce42b27.tar.gz
[BUGFIX] wifi: iwlwifi: mvm: do not allocate mpdu_counters on restart
The MPDU counters are already allocated on HW restart. type=bugfix ticket=none fixes=If9eb946e929a39e10fe5f4638bc8bc3f8976edf1 Change-Id: I348133adb4d0e69c993e830a245f281b8c8fe1d8 Signed-off-by: Benjamin Berg <benjamin.berg@intel.com> Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/98193 Tested-by: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM> 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: Miriam Rachel Korenblit <miriam.rachel.korenblit@intel.com> x-iwlwifi-stack-dev: d05093dd32b1e87ddf5eed3277bf2d41cbc49e79
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c3
-rw-r--r--versions2
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c
index edf54eeb34..e56500d67e 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c
@@ -734,7 +734,8 @@ int iwl_mvm_mld_add_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
}
/* MPDUs are counted only when EMLSR is possible */
- if (vif->type == NL80211_IFTYPE_STATION && !vif->p2p &&
+ if (!test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status) &&
+ vif->type == NL80211_IFTYPE_STATION && !vif->p2p &&
!sta->tdls && ieee80211_vif_is_mld(vif)) {
mvm_sta->mpdu_counters =
kcalloc(mvm->trans->num_rx_queues,
diff --git a/versions b/versions
index 4c90f6e706..8aa6f721d1 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:12000:18d9c6ae"
+BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:12001:d05093dd"