commit 7db4ef75f0190d98dbc84f8968ede3ac0ae29571
author Irfan Sheriff <isheriff@google.com> Mon Jun 18 09:39:07 2012 -0700
committer Irfan Sheriff <isheriff@google.com> Mon Jun 18 15:24:25 2012 -0700
tree 80b639b3f83f87d56356d27401f215bdb2ee85d2
parent 61dc7fcf73a67f1611a17db5b8170fb468e5137b

Restore STA reconnection behavior

Have the customized retry behavior only for P2P & do group failure indication
beyond 5 retries

Bug: 6674338
Change-Id: I58cba356ebdb7fc4eaa9bedfa417b7d5d35bb306

wpa_supplicant/wpa_supplicant.c

diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index cb5b42f..e1ad4d9 100644
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -582,8 +582,9 @@
 		wpa_supplicant_state_txt(state));
 
 #ifdef ANDROID_P2P
-	if(state == WPA_ASSOCIATED || (state <= WPA_INACTIVE))
-		wpa_s->assoc_retries = 0;
+	if(state == WPA_ASSOCIATED && wpa_s->current_ssid) {
+		wpa_s->current_ssid->assoc_retry = 0;
+	}
 #endif /* ANDROID_P2P */
 
 	if (state != WPA_SCANNING)