wifi: iwlwifi: mvm: use vif P2P type helper

Use ieee80211_vif_type_p2p instead of checking for IFTYPE_AP in
combination with vif->p2p.

Signed-off-by: Benjamin Berg <benjamin.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20240512072733.15a00a812c1b.I5ffee795d960c9beda46a934f5b4c70acde112f9@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 a7ec172eeade8513f5c3a63d6c650a3473a9594b..695b5ba3d023508849d276a442e8d1d21dbe48a3 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
@@ -208,7 +208,7 @@ static void iwl_mvm_scan_iterator(void *_data, u8 *mac,
 
        curr_mvmvif = iwl_mvm_vif_from_mac80211(data->current_vif);
 
-       if (vif->type == NL80211_IFTYPE_AP && vif->p2p &&
+       if (ieee80211_vif_type_p2p(vif) == NL80211_IFTYPE_P2P_GO &&
            mvmvif->deflink.phy_ctxt && curr_mvmvif->deflink.phy_ctxt &&
            mvmvif->deflink.phy_ctxt->id != curr_mvmvif->deflink.phy_ctxt->id)
                data->is_dcm_with_p2p_go = true;
@@ -2875,7 +2875,7 @@ 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) {
+       if (ieee80211_vif_type_p2p(vif) == NL80211_IFTYPE_P2P_GO) {
                u32 link_id;
 
                for (link_id = 0;