aboutsummaryrefslogtreecommitdiffstats
path: root/src/rsn_supp/wpa_i.h
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2008-06-09 13:26:47 (GMT)
committerJouni Malinen <j@w1.fi>2008-06-09 13:26:47 (GMT)
commit3e2ad1b932d827ddb038a5f9163bca766803811a (patch)
tree0cbabac0b9831ad683c7607b8d9e18bc789727f7 /src/rsn_supp/wpa_i.h
parent2eeaa5c9d0fc3afb75b75d77ba629da027abdc83 (diff)
downloadhostap-06-3e2ad1b932d827ddb038a5f9163bca766803811a.zip
hostap-06-3e2ad1b932d827ddb038a5f9163bca766803811a.tar.gz
hostap-06-3e2ad1b932d827ddb038a5f9163bca766803811a.tar.bz2
Fixed race condition between disassociation event and group key handshake
This avoids getting stuck in state where wpa_supplicant has canceled scans, but the driver is actually in disassociated state. The previously used code that controlled scan timeout from WPA module is not really needed anymore (and has not been needed for past four years since authentication timeout was separated from scan request timeout), so this can simply be removed to resolved the race condition. As an extra bonus, this simplifies the interface to WPA module. [Bug 261]
Diffstat (limited to 'src/rsn_supp/wpa_i.h')
-rw-r--r--src/rsn_supp/wpa_i.h12
1 files changed, 0 insertions, 12 deletions
diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h
index c4cd07c..1505155 100644
--- a/src/rsn_supp/wpa_i.h
+++ b/src/rsn_supp/wpa_i.h
@@ -120,18 +120,6 @@ static inline wpa_states wpa_sm_get_state(struct wpa_sm *sm)
return sm->ctx->get_state(sm->ctx->ctx);
}
-static inline void wpa_sm_req_scan(struct wpa_sm *sm, int sec, int usec)
-{
- WPA_ASSERT(sm->ctx->req_scan);
- sm->ctx->req_scan(sm->ctx->ctx, sec, usec);
-}
-
-static inline void wpa_sm_cancel_scan(struct wpa_sm *sm)
-{
- WPA_ASSERT(sm->ctx->cancel_scan);
- sm->ctx->cancel_scan(sm->ctx->ctx);
-}
-
static inline void wpa_sm_deauthenticate(struct wpa_sm *sm, int reason_code)
{
WPA_ASSERT(sm->ctx->deauthenticate);