wifi: iwlwifi: mvm: allocate STA links only for active links

For the mvm driver, data structures match what's in the firmware,
we allocate FW IDs for them already etc. During link switch we
already allocate/free the STA links appropriately, but initially
we'd allocate them always. Fix this to allocate memory, a STA ID,
etc. only for active links.

Fixes: 57974a55d995 ("wifi: iwlwifi: mvm: refactor iwl_mvm_mac_sta_state_common()")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20240319100755.f2093ff73465.Ie891e1cc9c9df09ae22be6aad5c143e376f40f0e@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c
index 1628bf55458fcb0bf7d812970d619e815a89c950..6f9ba0c18fa38f07e2582c96ee75d970ed2aa21d 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c
@@ -582,14 +582,14 @@ static int iwl_mvm_mld_alloc_sta_links(struct iwl_mvm *mvm,
                                       struct ieee80211_sta *sta)
 {
        struct iwl_mvm_sta *mvm_sta = iwl_mvm_sta_from_mac80211(sta);
+       struct ieee80211_link_sta *link_sta;
        unsigned int link_id;
        int ret;
 
        lockdep_assert_held(&mvm->mutex);
 
-       for (link_id = 0; link_id < ARRAY_SIZE(sta->link); link_id++) {
-               if (!rcu_access_pointer(sta->link[link_id]) ||
-                   mvm_sta->link[link_id])
+       for_each_sta_active_link(vif, sta, link_sta, link_id) {
+               if (WARN_ON(mvm_sta->link[link_id]))
                        continue;
 
                ret = iwl_mvm_mld_alloc_sta_link(mvm, vif, sta, link_id);