diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2013-11-04 02:46:04 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2013-11-04 02:46:04 -0800 |
| commit | f8ce1455046454f7cc361c92b6f7a356502f98c8 (patch) | |
| tree | e94ce7f30bf484090ecdf8b544f1a8e114d1f28f | |
| parent | baed5e5217a54044e21c7a4321aaa21f8dbfd9b9 (diff) | |
| parent | d14765fb4313a79a45e15e72ee130a264d1b0f13 (diff) | |
| download | android_external_wpa_supplicant_8-f8ce1455046454f7cc361c92b6f7a356502f98c8.tar.gz android_external_wpa_supplicant_8-f8ce1455046454f7cc361c92b6f7a356502f98c8.tar.bz2 android_external_wpa_supplicant_8-f8ce1455046454f7cc361c92b6f7a356502f98c8.zip | |
Merge "Fix ENABLE_NETWORK not to reconnect in disconnected state"
| -rw-r--r-- | wpa_supplicant/wpa_supplicant.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c index 80f2d67d..bab3ccd1 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -1807,7 +1807,7 @@ static void wpa_supplicant_enable_one_network(struct wpa_supplicant *wpa_s, * Try to reassociate since there is no current configuration and a new * network was made available. */ - if (!wpa_s->current_ssid) + if (!wpa_s->current_ssid && !wpa_s->disconnected) wpa_s->reassociate = 1; } @@ -1828,7 +1828,7 @@ void wpa_supplicant_enable_network(struct wpa_supplicant *wpa_s, } else wpa_supplicant_enable_one_network(wpa_s, ssid); - if (wpa_s->reassociate) { + if (wpa_s->reassociate && !wpa_s->disconnected) { if (wpa_s->sched_scanning) { wpa_printf(MSG_DEBUG, "Stop ongoing sched_scan to add " "new network to scan filters"); |