From: Emmanuel Grumbach Date: Tue, 5 May 2026 13:12:15 +0000 (+0200) Subject: wifi: iwlwifi: don't blindly start the responder upon BSS_CHANGED_FTM_RESPONDER X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82a55ac4e399670900426797570145636ad9f0f3;p=thirdparty%2Fkernel%2Flinux.git wifi: iwlwifi: don't blindly start the responder upon BSS_CHANGED_FTM_RESPONDER mac80211 may just want to stop it, so check the ftm_responder boolean before starting the responder. Signed-off-by: Emmanuel Grumbach Reviewed-by: Miriam Rachel Korenblit Link: https://patch.msgid.link/20260505151241.285da8fbf7f4.I1b6922ca8d06d592356d7a5d190e6118fec1d5b5@changeid Signed-off-by: Johannes Berg --- diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c index 214e6d10081b1..c256cbc6602e2 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* - * Copyright (C) 2012-2014, 2018-2025 Intel Corporation + * Copyright (C) 2012-2014, 2018-2026 Intel Corporation * Copyright (C) 2013-2015 Intel Mobile Communications GmbH * Copyright (C) 2016-2017 Intel Deutschland GmbH */ @@ -3144,7 +3144,7 @@ iwl_mvm_bss_info_changed_ap_ibss(struct iwl_mvm *mvm, iwl_mvm_mac_ctxt_beacon_changed(mvm, vif, &vif->bss_conf)) IWL_WARN(mvm, "Failed updating beacon data\n"); - if (changes & BSS_CHANGED_FTM_RESPONDER) { + if ((changes & BSS_CHANGED_FTM_RESPONDER) && bss_conf->ftm_responder) { int ret = iwl_mvm_ftm_start_responder(mvm, vif, &vif->bss_conf); if (ret) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c index f1dbfeae20bc0..6ea9a7c8da0cb 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* - * Copyright (C) 2022-2025 Intel Corporation + * Copyright (C) 2022-2026 Intel Corporation */ #include "mvm.h" @@ -729,7 +729,7 @@ iwl_mvm_mld_link_info_changed_ap_ibss(struct iwl_mvm *mvm, IWL_WARN(mvm, "Failed updating beacon data\n"); /* FIXME: need to decide if we need FTM responder per link */ - if (changes & BSS_CHANGED_FTM_RESPONDER) { + if (changes & BSS_CHANGED_FTM_RESPONDER && link_conf->ftm_responder) { int ret = iwl_mvm_ftm_start_responder(mvm, vif, link_conf); if (ret)