sme: Check for prev_bssid from sme_event_disassoc

wpa_s->bssid is already cleared by mark_disassoc() when we're getting the
disassociation event for the case where wpa_supplicant requested
disassociation. wpa_s->sme.prev_bssid holds the BSSID we need to check
for, so use that instead.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Samuel Ortiz 2010-08-18 21:23:26 +03:00 committed by Jouni Malinen
parent 2e75a2b3a6
commit 7e26053a2c

View File

@ -474,7 +474,7 @@ void sme_event_disassoc(struct wpa_supplicant *wpa_s,
union wpa_event_data *data) union wpa_event_data *data)
{ {
wpa_printf(MSG_DEBUG, "SME: Disassociation event received"); wpa_printf(MSG_DEBUG, "SME: Disassociation event received");
if (!is_zero_ether_addr(wpa_s->bssid) && if (wpa_s->sme.prev_bssid_set &&
!(wpa_s->drv_flags & WPA_DRIVER_FLAGS_USER_SPACE_MLME)) { !(wpa_s->drv_flags & WPA_DRIVER_FLAGS_USER_SPACE_MLME)) {
/* /*
* cfg80211/mac80211 can get into somewhat confused state if * cfg80211/mac80211 can get into somewhat confused state if
@ -484,7 +484,7 @@ void sme_event_disassoc(struct wpa_supplicant *wpa_s,
*/ */
wpa_printf(MSG_DEBUG, "SME: Deauthenticate to clear driver " wpa_printf(MSG_DEBUG, "SME: Deauthenticate to clear driver "
"state"); "state");
wpa_drv_deauthenticate(wpa_s, wpa_s->bssid, wpa_drv_deauthenticate(wpa_s, wpa_s->sme.prev_bssid,
WLAN_REASON_DEAUTH_LEAVING); WLAN_REASON_DEAUTH_LEAVING);
} }
} }