From: Johannes Berg Date: Wed, 11 Oct 2023 10:07:30 +0000 (+0300) Subject: wifi: iwlwifi: mvm: remove TDLS stations from FW X-Git-Tag: v6.6.17~3502 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7c59977ffad1c98838b225368a8b6753f1881b30;p=platform%2Fkernel%2Flinux-rpi.git wifi: iwlwifi: mvm: remove TDLS stations from FW [ Upstream commit 7b404c5cff3d4270fcd5212b6776c8484623ac74 ] When we remove TDLS stations, we need to remove them from FW immediately, even while associated. Some previous refactoring here lost the sta ID condition, add it back. Fixes: 57974a55d995 ("wifi: iwlwifi: mvm: refactor iwl_mvm_mac_sta_state_common()") Signed-off-by: Johannes Berg Signed-off-by: Gregory Greenman Link: https://lore.kernel.org/r/20231011130030.933011e710a9.I77c069c781e8b2b698b86cc3f43fc3c7e2dde114@changeid Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c index ebbe165..2c231f4 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c @@ -2059,7 +2059,8 @@ bool iwl_mvm_sta_del(struct iwl_mvm *mvm, struct ieee80211_vif *vif, *status = IWL_MVM_QUEUE_FREE; } - if (vif->type == NL80211_IFTYPE_STATION) { + if (vif->type == NL80211_IFTYPE_STATION && + mvm_link->ap_sta_id == sta_id) { /* if associated - we can't remove the AP STA now */ if (vif->cfg.assoc) return true;