diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-11-20 06:10:47 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-11-20 06:10:47 -0800 |
| commit | f8341077df129cee1d9305d0acfdccbc239de240 (patch) | |
| tree | dbc2f57fc86c9856eb7822e3b7073d4c38b568be | |
| parent | bedb15e4d8b38dd8bfd13359b88d8d35ba585057 (diff) | |
| parent | c1eb4a27762301ef7f7049b3137a00de78152486 (diff) | |
| download | android_external_wpa_supplicant_8-f8341077df129cee1d9305d0acfdccbc239de240.tar.gz android_external_wpa_supplicant_8-f8341077df129cee1d9305d0acfdccbc239de240.tar.bz2 android_external_wpa_supplicant_8-f8341077df129cee1d9305d0acfdccbc239de240.zip | |
Merge "WPS: Fix WPS-in-search check when STA_AUTOCONNECT is disabled"
| -rw-r--r-- | wpa_supplicant/events.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c index 43d60046..a9e6439c 100644 --- a/wpa_supplicant/events.c +++ b/wpa_supplicant/events.c @@ -2163,10 +2163,12 @@ static void wpa_supplicant_event_disassoc_finish(struct wpa_supplicant *wpa_s, } if (!wpa_s->disconnected && (!wpa_s->auto_reconnect_disabled || - wpa_s->key_mgmt == WPA_KEY_MGMT_WPS)) { + wpa_s->key_mgmt == WPA_KEY_MGMT_WPS || + wpas_wps_searching(wpa_s))) { wpa_dbg(wpa_s, MSG_DEBUG, "Auto connect enabled: try to " - "reconnect (wps=%d wpa_state=%d)", + "reconnect (wps=%d/%d wpa_state=%d)", wpa_s->key_mgmt == WPA_KEY_MGMT_WPS, + wpas_wps_searching(wpa_s), wpa_s->wpa_state); if (wpa_s->wpa_state == WPA_COMPLETED && wpa_s->current_ssid && |