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 a3153aa..c540bd4 100644
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -122,6 +122,7 @@
 		return;
 
 	wpa_supplicant_set_state(wpa_s, WPA_DISCONNECTED);
+	wpa_s->conf->ap_scan = DEFAULT_AP_SCAN;
 	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);
@@ -1404,7 +1405,7 @@
 			"reconnect (wps=%d)",
 			wpa_s->key_mgmt == WPA_KEY_MGMT_WPS);
 		if (wpa_s->wpa_state >= WPA_ASSOCIATING)
-			wpa_supplicant_req_scan(wpa_s, 0, 100000);
+			wpa_supplicant_req_scan(wpa_s, 0, 500000);
 	} else {
 		wpa_dbg(wpa_s, MSG_DEBUG, "WPA: Auto connect disabled: do not "
 			"try to re-connect");