summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2024-03-18 13:50:13 +0100
committeriwlwifi publisher <>2024-04-17 13:40:33 +0000
commit857ecc98cd7aca1e74b369dcf48b124046c4912f (patch)
treeaddd68844d67d60d5674c38f42e6deff27cf08ed
parent4e0cb7e58e0fbcf139402bce88b7833ae827901a (diff)
downloadbackport-iwlwifi-857ecc98cd7aca1e74b369dcf48b124046c4912f.tar.gz
[BUGFIX] wifi: iwlwifi: mvm: check correct restart bit
Seems I copy/pasted the wrong bit, check the right one. type=bugfix ticket=none fixes=I4164f5c9c444b64a9abbaab14c23858713778e35 Change-Id: I1fb424216d3d9a4399dfcf70b3128c1293d9756e Signed-off-by: Johannes Berg <johannes.berg@intel.com> Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/99794 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> Reviewed-by: Miriam Rachel Korenblit <miriam.rachel.korenblit@intel.com> (cherry picked from commit 133de80aad37abd8ef4ce72565d6f07c0d834e01) Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/99842 Reviewed-by: Golan Ben Ami <golan.ben.ami@intel.com> PerCI-Ready: Golan Ben Ami <golan.ben.ami@intel.com> x-iwlwifi-stack-dev: efa5c95127c04c5cb449d15549af14b375a3f26b
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c2
-rw-r--r--versions2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
index 8f1edf42c5..be7574ecd5 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
@@ -1770,7 +1770,7 @@ void iwl_mvm_mac_init_mvmvif(struct iwl_mvm *mvm, struct iwl_mvm_vif *mvmvif)
{
lockdep_assert_held(&mvm->mutex);
- if (test_bit(IWL_MVM_STATUS_HW_RESTART_REQUESTED, &mvm->status))
+ if (test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status))
return;
INIT_DELAYED_WORK(&mvmvif->csa_work,
diff --git a/versions b/versions
index 986382ea4e..d3795e1208 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:12040:565bff91"
+BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:release/core87:12041:efa5c951"
BACKPORTS_BRANCH_TSTAMP="Apr 17 2024 13:11:40"