wifi: iwlwifi: mvm: Make iwl_mvm_diversity_iter() MLO aware

This function is MLO related, so it should iterate over all the links,
and not only on deflink.

Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230524203151.56a9c709e987.I9716195ec288cce2c929338c254ee9add8cfcc1f@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/utils.c b/drivers/net/wireless/intel/iwlwifi/mvm/utils.c
index af31b09c396644aca5d3fa3f9ac63392e37807a3..2a10d851d2e416b6e2b235b7936fb1a1ad0b6f77 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/utils.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/utils.c
@@ -413,16 +413,20 @@ static void iwl_mvm_diversity_iter(void *_data, u8 *mac,
 {
        struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
        struct iwl_mvm_diversity_iter_data *data = _data;
-       int i;
+       int i, link_id;
 
-       if (mvmvif->deflink.phy_ctxt != data->ctxt)
-               return;
+       for_each_mvm_vif_valid_link(mvmvif, link_id) {
+               struct iwl_mvm_vif_link_info *link_info = mvmvif->link[link_id];
 
-       for (i = 0; i < NUM_IWL_MVM_SMPS_REQ; i++) {
-               if (mvmvif->deflink.smps_requests[i] == IEEE80211_SMPS_STATIC ||
-                   mvmvif->deflink.smps_requests[i] == IEEE80211_SMPS_DYNAMIC) {
-                       data->result = false;
-                       break;
+               if (link_info->phy_ctxt != data->ctxt)
+                       continue;
+
+               for (i = 0; i < NUM_IWL_MVM_SMPS_REQ; i++) {
+                       if (link_info->smps_requests[i] == IEEE80211_SMPS_STATIC ||
+                           link_info->smps_requests[i] == IEEE80211_SMPS_DYNAMIC) {
+                               data->result = false;
+                               break;
+                       }
                }
        }
 }