wifi: iwlwifi: mvm: Fix FTM initiator flags

When secure LTF is used MFP must also be set.

Signed-off-by: Ilan Peer <ilan.peer@intel.com>
Reviewed-by: Avraham Stern <avraham.stern@intel.com>
Reviewed-by: Gregory Greenman <gregory.greenman@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20240129211905.6cad71069e87.I7f9fd5239cfd2244f155f88419980e6e91d00ff2@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c b/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c
index 233ae81884a0ea3a710f4bc5406b3e95ba4b611f..4863a3c746406ed70a398d8939e080e72636fa0b 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
 /*
  * Copyright (C) 2015-2017 Intel Deutschland GmbH
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  */
 #include <linux/etherdevice.h>
 #include <linux/math64.h>
@@ -821,9 +821,10 @@ iwl_mvm_ftm_put_target_v8(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
         * If secure LTF is turned off, replace the flag with PMF only
         */
        flags = le32_to_cpu(target->initiator_ap_flags);
-       if ((flags & IWL_INITIATOR_AP_FLAGS_SECURED) &&
-           !IWL_MVM_FTM_INITIATOR_SECURE_LTF) {
-               flags &= ~IWL_INITIATOR_AP_FLAGS_SECURED;
+       if (flags & IWL_INITIATOR_AP_FLAGS_SECURED) {
+               if (!IWL_MVM_FTM_INITIATOR_SECURE_LTF)
+                       flags &= ~IWL_INITIATOR_AP_FLAGS_SECURED;
+
                flags |= IWL_INITIATOR_AP_FLAGS_PMF;
                target->initiator_ap_flags = cpu_to_le32(flags);
        }