summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAvraham Stern <avraham.stern@intel.com>2024-03-08 00:12:28 +0200
committeriwlwifi publisher <>2024-04-17 13:11:10 +0000
commit9ca1efcf6d365dd15b9e47d386bb9b31193d8710 (patch)
tree7db7aa2d0b02af099cf5f5471bdc3ce8b60c3805
parentaf8eead6fa5b6ad75aed293d3b6d4e5d269d8bb1 (diff)
downloadbackport-iwlwifi-9ca1efcf6d365dd15b9e47d386bb9b31193d8710.tar.gz
[BUGFIX] wifi: iwlwifi: mvm: clear PMF flag when unprotected ftm is forced
When unprotected ftm is forced, need to also clear the PMF flag. type=bugfix ticket=none fixes=I7ab6c547513717e69ec385f72a8f43ea00bd9e0a Signed-off-by: Avraham Stern <avraham.stern@intel.com> Change-Id: If8a9dfe38ec57559465ad035fed1aedd93f1b01f Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/97999 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> x-iwlwifi-stack-dev: 97ca6a2fedfd5da90a4b23f2466e034d53274fcb
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c6
-rw-r--r--versions2
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c b/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c
index d683ab3e73..c6a90aae69 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c
@@ -585,8 +585,12 @@ iwl_mvm_ftm_put_target(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
rcu_read_unlock();
#ifdef CPTCFG_IWLWIFI_DEBUGFS
- if (mvmvif->ftm_unprotected)
+ if (mvmvif->ftm_unprotected) {
target->sta_id = IWL_MVM_INVALID_STA;
+ target->initiator_ap_flags &=
+ ~cpu_to_le32(IWL_INITIATOR_AP_FLAGS_PMF);
+ }
+
#endif
} else {
target->sta_id = IWL_MVM_INVALID_STA;
diff --git a/versions b/versions
index 1ab1f85b14..3ab20d36e3 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:12006:a87eb110"
+BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:12007:97ca6a2f"