From d10792199e36f357fb82d191ec7bfc6d9daa9e1c Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Wed, 5 Nov 2014 13:22:25 -0800 Subject: [PATCH] Add CTRL-EVENT-SCAN-FAILED notification in case of scan failure This is needed since the SCAN command with radio work returns before the actual driver operation to trigger a scan has been executed and as such, cannot return result of that operation. Signed-off-by: Dmitry Shmidt --- src/common/wpa_ctrl.h | 2 ++ wpa_supplicant/scan.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/common/wpa_ctrl.h b/src/common/wpa_ctrl.h index 8614a27bb..af1e77686 100644 --- a/src/common/wpa_ctrl.h +++ b/src/common/wpa_ctrl.h @@ -58,6 +58,8 @@ extern "C" { #define WPA_EVENT_SCAN_STARTED "CTRL-EVENT-SCAN-STARTED " /** New scan results available */ #define WPA_EVENT_SCAN_RESULTS "CTRL-EVENT-SCAN-RESULTS " +/** Scan command failed */ +#define WPA_EVENT_SCAN_FAILED "CTRL-EVENT-SCAN-FAILED " /** wpa_supplicant state change */ #define WPA_EVENT_STATE_CHANGE "CTRL-EVENT-STATE-CHANGE " /** A new BSS entry was added (followed by BSS entry id and BSSID) */ diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c index 4e266f0df..eb15d3e03 100644 --- a/wpa_supplicant/scan.c +++ b/wpa_supplicant/scan.c @@ -176,6 +176,8 @@ static void wpas_trigger_scan_cb(struct wpa_radio_work *work, int deinit) if (ret) { wpa_supplicant_notify_scanning(wpa_s, 0); wpas_notify_scan_done(wpa_s, 0); + wpa_msg_ctrl(wpa_s, MSG_INFO, WPA_EVENT_SCAN_FAILED "ret=%d", + ret); radio_work_done(work); return; }