From: Jouni Malinen <jouni@qca.qualcomm.com>
Date: Mon, 27 Oct 2014 18:13:39 +0000 (+0200)
Subject: WPS: Fix ap_scan=2 special association case
X-Git-Tag: hostap_2_4~1202
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=76d81b3272b8b570118b106c3f53f67f2c3bb1c4;p=thirdparty%2Fhostap.git

WPS: Fix ap_scan=2 special association case

Commit 22628eca3440976bf51846da0554099f7429b206 ('Support driver-based
BSS selection in ap_scan=1 mode') ended up disabling the special
ap_scan=2 WPS case where ap_scan=1 like scan followed by association is
used to find the WPS AP using wildcard SSID. Fix this by allowing
association request even with wpas_driver_bss_selection() when searching
for a WPS AP.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
---

diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index db10d96ee..517917fc8 100644
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -1611,7 +1611,8 @@ static void wpas_start_assoc_cb(struct wpa_radio_work *work, int deinit)
 	os_memset(&params, 0, sizeof(params));
 	wpa_s->reassociate = 0;
 	wpa_s->eap_expected_failure = 0;
-	if (bss && !wpas_driver_bss_selection(wpa_s)) {
+	if (bss &&
+	    (!wpas_driver_bss_selection(wpa_s) || wpas_wps_searching(wpa_s))) {
 #ifdef CONFIG_IEEE80211R
 		const u8 *ie, *md = NULL;
 #endif /* CONFIG_IEEE80211R */