Commit: f279460f92be28ea54860e1a85f986a76d685015 - external-wpa_supplicant_6 (git)

external/wpa_supplicant_6

Commit MetaInfo

• Revision: f279460f92be28ea54860e1a85f986a76d685015 (tree)
• Zeit: 2011-03-05 03:53:38
• Autor: Dmitry Shmidt <dimitrysh@goog...>
• Commiter: Dmitry Shmidt

Log Message

Remove WPA_IDLE state

Change-Id: Ia5f408616763e6c6f786f90f1a21e0a0f619100f
Signed-off-by: Dmitry Shmidt <[e-mail]>

Ändern Zusammenfassung

• modified: wpa_supplicant/src/common/defs.h
• modified: wpa_supplicant/wpa_supplicant.c

Diff

--- a/wpa_supplicant/src/common/defs.h
+++ b/wpa_supplicant/src/common/defs.h
@@ -186,22 +186,6 @@ typedef enum {
 	 * fully configured.
 	 */
 	WPA_COMPLETED
-
-#ifdef ANDROID
-	/**
-	 * WPA_IDLE - Eeplicit disconnect was performed
-	 *
-	 * This state is entered when a disconnect command is issued to the
-	 * supplicant. In this case, the supplicant not only disassociates
-	 * from the current network, but it also stops trying to associate
-	 * with any AP until a subsequent reconnect or reassociate command
-	 * is issued. This state was added to distinguish it from the
-	 * WPA_DISCONNECTED state, which is now reserved for disconnects
-	 * that were not explicitly requested by a client.
-	 * This state is reported to clients, but it is not internally stored.
-	 */
-	, WPA_IDLE
-#endif /* ANDROID */
 } wpa_states;
 
 #define MLME_SETPROTECTION_PROTECT_TYPE_NONE 0

--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -483,13 +483,9 @@ void wpa_supplicant_set_state(struct wpa_supplicant *wpa_s, wpa_states state)
 {
 #ifdef ANDROID
 	int network_id = -1;
-	if (wpa_s && wpa_s->current_ssid) {
+
+	if (wpa_s && wpa_s->current_ssid)
 		network_id = wpa_s->current_ssid->id;
-	}
-	wpa_states reported_state = state;
-	if (state == WPA_DISCONNECTED && wpa_s->disconnected) {
-		reported_state = WPA_IDLE;
-	}
 #endif
 	wpa_printf(MSG_DEBUG, "State: %s -> %s",
 		   wpa_supplicant_state_txt(wpa_s->wpa_state),
@@ -502,7 +498,7 @@ void wpa_supplicant_set_state(struct wpa_supplicant *wpa_s, wpa_states state)
 						wpa_s->wpa_state);
 #ifdef ANDROID
 	wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_STATE_CHANGE "id=%d state=%d BSSID=" MACSTR,
-		network_id, reported_state, MAC2STR(wpa_s->pending_bssid));
+		network_id, state, MAC2STR(wpa_s->pending_bssid));
 #endif
 
 	if (state == WPA_COMPLETED && wpa_s->new_connection) {