wifi: iwlwifi: mvm: adjust iwl_mvm_scan_respect_p2p_go_iter() for MLO

When looking for a GO on for setting the scan parameters, iterate
over all the available links.

Signed-off-by: Avraham Stern <avraham.stern@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230329100039.4eb25d5655d0.Ie69f7313e4337f78c262a835aea3f707273a4209@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
index 975edc02e63702d940fbe7c85cec8acadc3bf277..07045092c717fdb2ddbe0c01290cfbf145a6622e 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
@@ -2677,11 +2677,23 @@ static void iwl_mvm_scan_respect_p2p_go_iter(void *_data, u8 *mac,
        if (vif == data->current_vif)
                return;
 
-       if (vif->type == NL80211_IFTYPE_AP && vif->p2p &&
-           mvmvif->deflink.phy_ctxt->id < NUM_PHY_CTX &&
-           (data->band == NUM_NL80211_BANDS ||
-            mvmvif->deflink.phy_ctxt->channel->band == data->band))
-               data->p2p_go = true;
+       if (vif->type == NL80211_IFTYPE_AP && vif->p2p) {
+               u32 link_id;
+
+               for (link_id = 0;
+                    link_id < ARRAY_SIZE(mvmvif->link);
+                    link_id++) {
+                       struct iwl_mvm_vif_link_info *link =
+                               mvmvif->link[link_id];
+
+                       if (link && link->phy_ctxt->id < NUM_PHY_CTX &&
+                           (data->band == NUM_NL80211_BANDS ||
+                            link->phy_ctxt->channel->band == data->band)) {
+                               data->p2p_go = true;
+                               break;
+                       }
+               }
+       }
 }
 
 static bool _iwl_mvm_get_respect_p2p_go(struct iwl_mvm *mvm,