summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiri Korenblit <miriam.rachel.korenblit@intel.com>2024-03-04 20:00:46 +0200
committeriwlwifi publisher <>2024-04-17 13:04:34 +0000
commit581fb28a905f691d1d63c2c8461f3325cbbbcb8b (patch)
tree85f42ae6185cc95637d5247f8f96917203586efe
parentfb78f0010530e663d48357dc9a8dbb63734c098e (diff)
downloadbackport-iwlwifi-581fb28a905f691d1d63c2c8461f3325cbbbcb8b.tar.gz
[BUGFIX] wifi: iwlwifi: mvm: stop MLO scan in drv_stop
Since it is an internal scan, mac80211 won't stop it on stop flow. type=bugfix ticket=none fixes=I4a41065f6b3a6ec6c6e44e83bc97c277ff7c599e Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com> Change-Id: I92bcc8b38c29be7dba66db196d986c7808bc5f1b Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/97458 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> Reviewed-by: Ilan Peer <ilan.peer@intel.com> x-iwlwifi-stack-dev: baf508710261ab43b021466be3904956d62bfec6
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c5
-rw-r--r--versions2
2 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
index 5aa74b9b53..2a65e548a5 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
@@ -1454,6 +1454,11 @@ void iwl_mvm_mac_stop(struct ieee80211_hw *hw)
{
struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
+ /* Stop internal MLO scan, if running */
+ mutex_lock(&mvm->mutex);
+ iwl_mvm_scan_stop(mvm, IWL_MVM_SCAN_INT_MLO, false);
+ mutex_unlock(&mvm->mutex);
+
wiphy_work_flush(mvm->hw->wiphy, &mvm->async_handlers_wiphy_wk);
flush_work(&mvm->async_handlers_wk);
flush_work(&mvm->add_stream_wk);
diff --git a/versions b/versions
index 775e758111..891bb7bbab 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:11971:b079e954"
+BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11972:baf50871"