• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
Keine Tags

Frequently used words (click to add to your profile)

javaandroidc++linuxc#objective-ccocoa誰得qtrubypythonwindowsphpgamebathyscaphegui翻訳comegattwitterframeworkbtronvb.net計画中(planning stage)testdomarduinodirectxpreviewerゲームエンジン

external/wpa_supplicant_6


Commit MetaInfo

Revisionf279460f92be28ea54860e1a85f986a76d685015 (tree)
Zeit2011-03-05 03:53:38
AutorDmitry Shmidt <dimitrysh@goog...>
CommiterDmitry Shmidt

Log Message

Remove WPA_IDLE state

Change-Id: Ia5f408616763e6c6f786f90f1a21e0a0f619100f
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

Ändern Zusammenfassung

Diff

--- a/wpa_supplicant/src/common/defs.h
+++ b/wpa_supplicant/src/common/defs.h
@@ -186,22 +186,6 @@ typedef enum {
186186 * fully configured.
187187 */
188188 WPA_COMPLETED
189-
190-#ifdef ANDROID
191- /**
192- * WPA_IDLE - Eeplicit disconnect was performed
193- *
194- * This state is entered when a disconnect command is issued to the
195- * supplicant. In this case, the supplicant not only disassociates
196- * from the current network, but it also stops trying to associate
197- * with any AP until a subsequent reconnect or reassociate command
198- * is issued. This state was added to distinguish it from the
199- * WPA_DISCONNECTED state, which is now reserved for disconnects
200- * that were not explicitly requested by a client.
201- * This state is reported to clients, but it is not internally stored.
202- */
203- , WPA_IDLE
204-#endif /* ANDROID */
205189 } wpa_states;
206190
207191 #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)
483483 {
484484 #ifdef ANDROID
485485 int network_id = -1;
486- if (wpa_s && wpa_s->current_ssid) {
486+
487+ if (wpa_s && wpa_s->current_ssid)
487488 network_id = wpa_s->current_ssid->id;
488- }
489- wpa_states reported_state = state;
490- if (state == WPA_DISCONNECTED && wpa_s->disconnected) {
491- reported_state = WPA_IDLE;
492- }
493489 #endif
494490 wpa_printf(MSG_DEBUG, "State: %s -> %s",
495491 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)
502498 wpa_s->wpa_state);
503499 #ifdef ANDROID
504500 wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_STATE_CHANGE "id=%d state=%d BSSID=" MACSTR,
505- network_id, reported_state, MAC2STR(wpa_s->pending_bssid));
501+ network_id, state, MAC2STR(wpa_s->pending_bssid));
506502 #endif
507503
508504 if (state == WPA_COMPLETED && wpa_s->new_connection) {