Merge "Allow P2P CSA from 5GHz to 2.4GHz band" into tm-qpr-dev am: 6f3aa559f8 am: 0ec40660c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/19347221
Change-Id: I3b0ffd3c3646e7f875e25a5f8d9a694f69214e11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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;
}