wifi: iwlwifi: mvm: fix iwl_mvm_mac_flush_sta()

[ Upstream commit 43874283ce6c5bd32ac9d30878b2c96a974357cb ]

When I implemented iwl_mvm_mac_flush_sta() I completely botched it;
it basically always happens after the iwl_mvm_sta_pre_rcu_remove()
call, and that already clears mvm->fw_id_to_mac_id[] entries, so we
cannot rely on those at iwl_mvm_mac_flush_sta() time. This means it
never did anything.

Fix this by just going through the station IDs and now with the new
API for iwl_mvm_flush_sta(), call those.

Fixes: a6cc6ccb1c8a ("wifi: iwlwifi: mvm: support new flush_sta method")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20231011130030.0b5878e93118.I1093e60163052e7be64d2b01424097cd6a272979@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
index e68026a..a25ea63 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
@@ -5602,22 +5602,20 @@ void iwl_mvm_mac_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
 void iwl_mvm_mac_flush_sta(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                           struct ieee80211_sta *sta)
 {
+       struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);
        struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
-       int i;
+       struct iwl_mvm_link_sta *mvm_link_sta;
+       struct ieee80211_link_sta *link_sta;
+       int link_id;
 
        mutex_lock(&mvm->mutex);
-       for (i = 0; i < mvm->fw->ucode_capa.num_stations; i++) {
-               struct iwl_mvm_sta *mvmsta;
-               struct ieee80211_sta *tmp;
-
-               tmp = rcu_dereference_protected(mvm->fw_id_to_mac_id[i],
-                                               lockdep_is_held(&mvm->mutex));
-               if (tmp != sta)
+       for_each_sta_active_link(vif, sta, link_sta, link_id) {
+               mvm_link_sta = rcu_dereference_protected(mvmsta->link[link_id],
+                                                        lockdep_is_held(&mvm->mutex));
+               if (!mvm_link_sta)
                        continue;
 
-               mvmsta = iwl_mvm_sta_from_mac80211(sta);
-
-               if (iwl_mvm_flush_sta(mvm, mvmsta->deflink.sta_id,
+               if (iwl_mvm_flush_sta(mvm, mvm_link_sta->sta_id,
                                      mvmsta->tfd_queue_msk))
                        IWL_ERR(mvm, "flush request fail\n");
        }