Android: P2P: Fix frequency choice if multichannel supported
Bug: 10513949
Change-Id: Id9e5b2560630049a6ca5f74e3785d4a2c2be3124
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c
index 7179080..d7b3189 100644
--- a/wpa_supplicant/p2p_supplicant.c
+++ b/wpa_supplicant/p2p_supplicant.c
@@ -4018,13 +4018,21 @@
if (!p2p_supported_freq(wpa_s->global->p2p, freqs[i]))
continue;
+#ifndef ANDROID_P2P
wpa_printf(MSG_DEBUG, "P2P: Try to force us to use frequency (%u MHz) which is already in use",
*force_freq);
*force_freq = freqs[i];
+#endif
if (*pref_freq == 0 && num < wpa_s->num_multichan_concurrent) {
wpa_printf(MSG_DEBUG, "P2P: Try to prefer a frequency we are already using");
- *pref_freq = *force_freq;
+ *pref_freq = freqs[i];
+#ifdef ANDROID_P2P
+ } else {
+ wpa_printf(MSG_DEBUG, "P2P: Try to force us to use frequency (%u MHz) which is already in use",
+ *force_freq);
+ *force_freq = freqs[i];
+#endif
}
break;
}