From 7441698fcf564645e5f62904d3ca44af957060f4 Mon Sep 17 00:00:00 2001 From: Ayala Beker Date: Mon, 29 Feb 2016 14:30:03 +0200 Subject: [PATCH] nl80211: Abort an ongoing scan upon scan timeout indication Currently, when scan is stuck in the kernel/driver/fw, the nl80211 driver tries to recover by faking a SCAN_RESULTS flow. However, the scan is still stuck in the kernel/driver/fw. To avoid that stuck request, abort it upon scan timeout. Signed-off-by: Ayala Beker --- src/drivers/driver_nl80211_scan.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/drivers/driver_nl80211_scan.c b/src/drivers/driver_nl80211_scan.c index e430a2f48..c08989146 100644 --- a/src/drivers/driver_nl80211_scan.c +++ b/src/drivers/driver_nl80211_scan.c @@ -96,12 +96,20 @@ static int nl80211_get_noise_for_scan_results( void wpa_driver_nl80211_scan_timeout(void *eloop_ctx, void *timeout_ctx) { struct wpa_driver_nl80211_data *drv = eloop_ctx; + + wpa_printf(MSG_DEBUG, "nl80211: Scan timeout - try to abort it"); + if (!wpa_driver_nl80211_abort_scan(drv->first_bss)) + return; + + wpa_printf(MSG_DEBUG, "nl80211: Failed to abort scan"); + if (drv->ap_scan_as_station != NL80211_IFTYPE_UNSPECIFIED) { wpa_driver_nl80211_set_mode(drv->first_bss, drv->ap_scan_as_station); drv->ap_scan_as_station = NL80211_IFTYPE_UNSPECIFIED; } - wpa_printf(MSG_DEBUG, "Scan timeout - try to get results"); + + wpa_printf(MSG_DEBUG, "nl80211: Try to get scan results"); wpa_supplicant_event(timeout_ctx, EVENT_SCAN_RESULTS, NULL); }