jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

nl80211: Do not reset vendor_scan_cookie after scan timeout

Browse source 
If vendor_scan_cookie is set to 0 after the scan_abort due to the scan
timeout ends in a cookie mismatch when processing the following
QCA_NL80211_VENDOR_SUBCMD_SCAN_DONE indication. This ends up considering
the scan results as being for an external scan and thus the current
ongoing scan is not removed from the radio_work. Hence, do not reset
this vendor_scan_cookie after the scan abort so that the scan completion
event gets processed properly and vendor_scan_cookie gets cleared at
that point.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Sunil Dutt 2017-01-25 16:36:19 +05:30 committed by Jouni Malinen
parent 6d08f23f0a
commit f593b6c11d
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/drivers/driver_nl80211_scan.c
View file

@ -156,10 +156,8 @@ void wpa_driver_nl80211_scan_timeout(void *eloop_ctx, void *timeout_ctx)
wpa_printf(MSG_DEBUG, "nl80211: Scan timeout - try to abort it"); wpa_printf(MSG_DEBUG, "nl80211: Scan timeout - try to abort it");
#ifdef CONFIG_DRIVER_NL80211_QCA #ifdef CONFIG_DRIVER_NL80211_QCA
if (drv->vendor_scan_cookie && if (drv->vendor_scan_cookie &&
nl80211_abort_vendor_scan(drv, drv->vendor_scan_cookie) == 0) { nl80211_abort_vendor_scan(drv, drv->vendor_scan_cookie) == 0)
drv->vendor_scan_cookie = 0;
return; return;
}
#endif /* CONFIG_DRIVER_NL80211_QCA */ #endif /* CONFIG_DRIVER_NL80211_QCA */
if (!drv->vendor_scan_cookie && if (!drv->vendor_scan_cookie &&
nl80211_abort_scan(drv->first_bss) == 0) nl80211_abort_scan(drv->first_bss) == 0)