commit 82c2c2331d5d0bccf5d49f03347c9a23285a305b
author Jouni Malinen <jouni@qca.qualcomm.com> Fri Jul 19 13:38:07 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 19 13:38:07 2013 -0700
tree 66e1dd61f53333d0cf6a5ff03148e120d5c159bf
parent f7f24ff14fa691903849942444025175f627e873
parent 26a545dc8d839bfa32e8cc2d52a6c63adfa4daf7

am 26a545dc: Do not try auto connect mechanism in disconnected state, DO NOT MERGE

* commit '26a545dc8d839bfa32e8cc2d52a6c63adfa4daf7':
  Do not try auto connect mechanism in disconnected state, DO NOT MERGE

wpa_supplicant/events.c

diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index 6c0a246..671fd74 100644
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -1957,8 +1957,9 @@
 			"pre-shared key may be incorrect");
 		wpas_auth_failed(wpa_s);
 	}
-	if (!wpa_s->auto_reconnect_disabled ||
-	    wpa_s->key_mgmt == WPA_KEY_MGMT_WPS) {
+	if (!wpa_s->disconnected &&
+	    (!wpa_s->auto_reconnect_disabled ||
+	     wpa_s->key_mgmt == WPA_KEY_MGMT_WPS)) {
 		wpa_dbg(wpa_s, MSG_DEBUG, "Auto connect enabled: try to "
 			"reconnect (wps=%d wpa_state=%d)",
 			wpa_s->key_mgmt == WPA_KEY_MGMT_WPS,