From: Jouni Malinen <j@w1.fi>
Date: Fri, 1 Nov 2013 11:04:38 +0000 (+0200)
Subject: AOSP: Set ap_scan to default in case of disassociation
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d26fe43903a76e91b1ddad8c7517c08e4041b52;p=thirdparty%2Fhostap.git

AOSP: Set ap_scan to default in case of disassociation

A rebased version of this AOSP commit:

commit 43007fd3a75a07189a11510e131216284b48e098
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Mon Apr 11 15:58:40 2011 -0700

    Set ap_scan to default in case of disassociation

    Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
---

diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index 624ed2545..daceadec9 100644
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -160,6 +160,9 @@ void wpa_supplicant_mark_disassoc(struct wpa_supplicant *wpa_s)
 		return;
 
 	wpa_supplicant_set_state(wpa_s, WPA_DISCONNECTED);
+#ifdef ANDROID
+	wpa_s->conf->ap_scan = DEFAULT_AP_SCAN;
+#endif
 	bssid_changed = !is_zero_ether_addr(wpa_s->bssid);
 	os_memset(wpa_s->bssid, 0, ETH_ALEN);
 	os_memset(wpa_s->pending_bssid, 0, ETH_ALEN);
@@ -2044,7 +2047,11 @@ static void wpa_supplicant_event_disassoc_finish(struct wpa_supplicant *wpa_s,
 			fast_reconnect_ssid = wpa_s->current_ssid;
 #endif /* CONFIG_NO_SCAN_PROCESSING */
 		} else if (wpa_s->wpa_state >= WPA_ASSOCIATING)
+#ifdef ANDROID
+			wpa_supplicant_req_scan(wpa_s, 0, 500000);
+#else
 			wpa_supplicant_req_scan(wpa_s, 0, 100000);
+#endif
 		else
 			wpa_dbg(wpa_s, MSG_DEBUG, "Do not request new "
 				"immediate scan");