diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2011-03-02 11:16:22 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2011-03-04 10:53:38 -0800 |
| commit | f279460f92be28ea54860e1a85f986a76d685015 (patch) | |
| tree | b7412e955d33b45882d8430c5d094906dcf04d24 | |
| parent | 06571386a48d80643f46c990449c2a38d01bd13c (diff) | |
| download | wpa_supplicant_6-f279460f92be28ea54860e1a85f986a76d685015.tar.gz | |
Remove WPA_IDLE state
Change-Id: Ia5f408616763e6c6f786f90f1a21e0a0f619100f
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| -rw-r--r-- | wpa_supplicant/src/common/defs.h | 16 | ||||
| -rw-r--r-- | wpa_supplicant/wpa_supplicant.c | 10 |
2 files changed, 3 insertions, 23 deletions
diff --git a/wpa_supplicant/src/common/defs.h b/wpa_supplicant/src/common/defs.h index 29e30e7..4930e73 100644 --- 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 diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c index 27fc84a..c90cf41 100644 --- 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) { |