summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiri Korenblit <miriam.rachel.korenblit@intel.com>2024-03-07 22:00:16 +0200
committeriwlwifi publisher <>2024-04-17 13:08:17 +0000
commit3dab86fa855d9b485f65d973d82c9bfedd868fca (patch)
tree373663677a38104bc21aefbd92a3e95e74d5ba07
parent4235079e7cafdd9de22506a4cd8d5ad03b8b13aa (diff)
downloadbackport-iwlwifi-3dab86fa855d9b485f65d973d82c9bfedd868fca.tar.gz
[BUGFIX] wifi: iwlwifi: mvm: don't warn if there is no ap sta
When we disconnect and EMLSR mode is active, we get to iwl_mvm_esr_mode_inactive after the sta is removed, and then the call to iwl_mvm_restart_mpdu_count will result a warning. But this is actually a valid case, Simply don't warn. type=bugfix ticket=jira:WIFI-393581 fixes=If9eb946e929a39e10fe5f4638bc8bc3f8976edf1 Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com> Change-Id: I527dd7a27f55f4c8edaeeeb7011e0ccb480274aa Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/98145 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> Tested-by: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM> x-iwlwifi-stack-dev: 7c7b52a83802a0b26411f1c7bb67b76f39e4b230
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c2
-rw-r--r--versions2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c
index a4f92433fe..850ae96569 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c
@@ -235,7 +235,7 @@ static void iwl_mvm_restart_mpdu_count(struct iwl_mvm *mvm,
lockdep_assert_held(&mvm->mutex);
- if (WARN_ON(!ap_sta))
+ if (!ap_sta)
return;
mvmsta = iwl_mvm_sta_from_mac80211(ap_sta);
diff --git a/versions b/versions
index 5528442ab3..3ff10a66b0 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:11991:ba01fec3"
+BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11992:7c7b52a8"