Index: wpa_supplicant-0.5.8/wpa_supplicant.c
===================================================================
--- wpa_supplicant-0.5.8.orig/wpa_supplicant.c
+++ wpa_supplicant-0.5.8/wpa_supplicant.c
@@ -1513,9 +1513,9 @@ void wpa_supplicant_associate(struct wpa
 		/* Timeout for IEEE 802.11 authentication and association */
 		int timeout;
 		if (assoc_failed)
-			timeout = 5;
+			timeout = 15;
 		else if (wpa_s->conf->ap_scan == 1)
-			timeout = 10;
+			timeout = 15;
 		else
 			timeout = 60;
 		wpa_supplicant_req_auth_timeout(wpa_s, timeout, 0);