diff options
| author | Jouni Malinen <j@w1.fi> | 2012-09-01 17:20:27 +0300 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2012-09-09 13:06:56 -0700 |
| commit | f8a26a8e6e081a2c576568198d0bcb4f976258ac (patch) | |
| tree | 1c735db7ad6f17f40889483449f224be5d419bf9 | |
| parent | 2b89da85b8cfe9bb862e8dd334855263c3522c00 (diff) | |
| download | external_wpa_supplicant_8-f8a26a8e6e081a2c576568198d0bcb4f976258ac.zip external_wpa_supplicant_8-f8a26a8e6e081a2c576568198d0bcb4f976258ac.tar.gz external_wpa_supplicant_8-f8a26a8e6e081a2c576568198d0bcb4f976258ac.tar.bz2 | |
SME: Fix disconnec-while-authenticating
Commit 0d30cc240fa36905b034dc9676f9d8da0ac18e56 forced
wpa_s->current_ssid to be cleared in wpa_supplicant_mark_disassoc()
which gets called from wpa_supplicant_event_disassoc(). This broke SME
disassoc-while-authenticating workaround for cfg80211. Fix this by
restoring wpa_s->current_ssid in case SME authentication is in progress.
Signed-hostap: Jouni Malinen <j@w1.fi>
| -rw-r--r-- | wpa_supplicant/events.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c index 48faff2..c3acad4 100644 --- a/wpa_supplicant/events.c +++ b/wpa_supplicant/events.c @@ -1842,6 +1842,7 @@ static void wpa_supplicant_event_disassoc_finish(struct wpa_supplicant *wpa_s, u8 prev_pending_bssid[ETH_ALEN]; struct wpa_bss *fast_reconnect = NULL; struct wpa_ssid *fast_reconnect_ssid = NULL; + struct wpa_ssid *last_ssid; authenticating = wpa_s->wpa_state == WPA_AUTHENTICATING; os_memcpy(prev_pending_bssid, wpa_s->pending_bssid, ETH_ALEN); @@ -1914,10 +1915,13 @@ static void wpa_supplicant_event_disassoc_finish(struct wpa_supplicant *wpa_s, wpa_s->keys_cleared = 0; wpa_clear_keys(wpa_s, wpa_s->bssid); } + last_ssid = wpa_s->current_ssid; wpa_supplicant_mark_disassoc(wpa_s); - if (authenticating && (wpa_s->drv_flags & WPA_DRIVER_FLAGS_SME)) + if (authenticating && (wpa_s->drv_flags & WPA_DRIVER_FLAGS_SME)) { sme_disassoc_while_authenticating(wpa_s, prev_pending_bssid); + wpa_s->current_ssid = last_ssid; + } if (fast_reconnect) { #ifndef CONFIG_NO_SCAN_PROCESSING |