diff options
| author | Irfan Sheriff <isheriff@google.com> | 2011-08-03 09:11:49 -0700 |
|---|---|---|
| committer | Irfan Sheriff <isheriff@google.com> | 2011-08-03 09:13:55 -0700 |
| commit | 622b66d6efd0cccfeb8623184fadf2f76e7e8206 (patch) | |
| tree | e8953ff9e60b298f18da05705b88926dfa3399ea /wpa_supplicant/wpa_supplicant.c | |
| parent | 7b8da2ee6c87c38144dae7882a29d98c616a8738 (diff) | |
| download | external_wpa_supplicant_8-622b66d6efd0cccfeb8623184fadf2f76e7e8206.zip external_wpa_supplicant_8-622b66d6efd0cccfeb8623184fadf2f76e7e8206.tar.gz external_wpa_supplicant_8-622b66d6efd0cccfeb8623184fadf2f76e7e8206.tar.bz2 | |
Send TERMINATE to framework after a full deinit
Bug: 5102386
Change-Id: I41fc00ae469cf2752fe831db56db22c9ace73f52
Diffstat (limited to 'wpa_supplicant/wpa_supplicant.c')
| -rw-r--r-- | wpa_supplicant/wpa_supplicant.c | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c index 74a2286..b97912b 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -382,6 +382,8 @@ static void wpa_supplicant_cleanup(struct wpa_supplicant *wpa_s) wpa_s->l2_br = NULL; } +/* This has been moved to wpa_supplicant_deinit_iface to avoid a race with hostapd */ +#ifndef ANDROID if (wpa_s->ctrl_iface) { wpa_supplicant_ctrl_iface_deinit(wpa_s->ctrl_iface); wpa_s->ctrl_iface = NULL; @@ -393,6 +395,7 @@ static void wpa_supplicant_cleanup(struct wpa_supplicant *wpa_s) wpa_config_free(wpa_s->conf); wpa_s->conf = NULL; } +#endif os_free(wpa_s->confname); wpa_s->confname = NULL; @@ -2313,6 +2316,29 @@ static void wpa_supplicant_deinit_iface(struct wpa_supplicant *wpa_s, if (wpa_s->drv_priv) wpa_drv_deinit(wpa_s); + +/** + * The wpa_drv_deinit call after sending TERMINATING to the framework causes + * race condition with the start of hostapd. + * This has been moved out of wpa_supplicant_cleanup(). Send the control + * message and free config after the deinit. + */ +#ifdef ANDROID + wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_TERMINATING); + + if (wpa_s->ctrl_iface) { + wpa_supplicant_ctrl_iface_deinit(wpa_s->ctrl_iface); + wpa_s->ctrl_iface = NULL; + } + + if (wpa_s->conf != NULL) { + struct wpa_ssid *ssid; + for (ssid = wpa_s->conf->ssid; ssid; ssid = ssid->next) + wpas_notify_network_removed(wpa_s, ssid); + wpa_config_free(wpa_s->conf); + wpa_s->conf = NULL; + } +#endif } @@ -2632,9 +2658,6 @@ void wpa_supplicant_deinit(struct wpa_global *global) if (global == NULL) return; -#ifdef ANDROID - wpa_supplicant_terminate(0, global); -#endif #ifdef CONFIG_P2P wpas_p2p_deinit_global(global); #endif /* CONFIG_P2P */ |