diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2013-09-10 10:52:57 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2013-09-10 10:52:57 -0700 |
| commit | 51a47d533b6bf0efff06cc80195a588852a45058 (patch) | |
| tree | b14d7cd586255560dad9fd565e7bb93231606ca5 | |
| parent | 3733ef3f86d438d165bb13eb3b41415c3410be85 (diff) | |
| download | wpa_supplicant_8-51a47d533b6bf0efff06cc80195a588852a45058.tar.gz | |
Android: P2P: Fix frequency choice if multichannel supported
Bug: 10513949
Change-Id: Id9e5b2560630049a6ca5f74e3785d4a2c2be3124
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| -rw-r--r-- | wpa_supplicant/p2p_supplicant.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c index 71790805..d7b31896 100644 --- a/wpa_supplicant/p2p_supplicant.c +++ b/wpa_supplicant/p2p_supplicant.c @@ -4018,13 +4018,21 @@ static int wpas_p2p_setup_freqs(struct wpa_supplicant *wpa_s, int freq, 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; } |