From: Jouni Malinen <jouni.malinen@atheros.com>
Date: Tue, 19 Oct 2010 15:38:49 +0000 (+0300)
Subject: P2P: Scan all channels if GO is not found from common channels
X-Git-Tag: hostap-1-bp~949
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2af1c18735a8dd9cf71abe4f457bf9e402371c16;p=thirdparty%2Fhostap.git

P2P: Scan all channels if GO is not found from common channels

This is not supposed to happen, but in theory, the GO may end up
changing its channels at some point. While it would be reasonable
to use one of the common channels, GO may be forced to use another
channel. The most likely reason for this would be if the P2P client
is enforcing only a single channel to be used (e.g., to avoid
multi-channel concurrent operations).
---

diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c
index ee105d902..2769c2f84 100644
--- a/wpa_supplicant/scan.c
+++ b/wpa_supplicant/scan.c
@@ -401,7 +401,8 @@ static void wpa_supplicant_scan(void *eloop_ctx, void *timeout_ctx)
 			params.freqs = os_zalloc(2 * sizeof(int));
 			if (params.freqs)
 				params.freqs[0] = wpa_s->go_params->freq;
-		} else if (wpa_s->go_params->freq_list[0]) {
+		} else if (wpa_s->p2p_in_provisioning < 8 &&
+			   wpa_s->go_params->freq_list[0]) {
 			wpa_printf(MSG_DEBUG, "P2P: Scan only common "
 				   "channels");
 			int_array_concat(&params.freqs,