commit 3adbd760f306a552a503f9580926c875e0fb3bbc
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jul 26 08:30:53 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 26 08:30:53 2022 +0000
tree 11e589703afd2c48a0ef50260b9dc7507b116078
parent dafa997c32535db8ccecb9a322157efc1e73f45f
parent 44a0f2c196d0f4a7b0b3e86001d1b30a055cb18e

Merge "P2P: support p2p configuration for the dedicated P2P interface"

wpa_supplicant/p2p_supplicant.c

diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c
index 14ce58c..2e7cc4c 100644
--- a/wpa_supplicant/p2p_supplicant.c
+++ b/wpa_supplicant/p2p_supplicant.c
@@ -9745,9 +9745,12 @@
 		goto out;
 	}
 
-	if (conf->hw_mode != wpa_s->ap_iface->current_mode->mode) {
-		wpa_dbg(wpa_s, MSG_DEBUG,
-			"P2P CSA: CSA to a different band is not supported");
+	if (conf->hw_mode != wpa_s->ap_iface->current_mode->mode &&
+	    (wpa_s->ap_iface->current_mode->mode != HOSTAPD_MODE_IEEE80211A ||
+	     conf->hw_mode != HOSTAPD_MODE_IEEE80211G)) {
+		wpa_dbg(wpa_s, MSG_INFO,
+			"P2P CSA: CSA from Hardware mode %d to %d is not supported",
+			wpa_s->ap_iface->current_mode->mode, conf->hw_mode);
 		ret = -1;
 		goto out;
 	}