diff options
| author | Jouni Malinen <j@w1.fi> | 2014-01-03 12:00:13 +0200 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2014-06-12 14:07:29 -0700 |
| commit | 4590807ee8ab5828a6a423de063c14d8d9027bb4 (patch) | |
| tree | 0ffcd24bf3a555a74e945d4f786b2be7de7c1d50 | |
| parent | 9883d084cd7c3311fc59cd7f7071b4c5bc510206 (diff) | |
| download | android_external_wpa_supplicant_8-4590807ee8ab5828a6a423de063c14d8d9027bb4.tar.gz android_external_wpa_supplicant_8-4590807ee8ab5828a6a423de063c14d8d9027bb4.tar.bz2 android_external_wpa_supplicant_8-4590807ee8ab5828a6a423de063c14d8d9027bb4.zip | |
Ignore externally triggered scan results with scan_res_handler.
wpa_s->scan_res_handler is set only for cases where a scan operation is
requested for a specific purpose. As such, this callback should only be
called when a scan result from a scan that was triggered by
wpa_supplicant is processed.
CRs-Fixed: 570640
Git-commit: 06f9acce189b20daee8fe8fd46cd849425304130
Git-repo : git://w1.fi/srv/git/hostap.git
Signed-hostap: Jouni Malinen <j@w1.fi>
Change-Id: I75a34a885b19ef0115d47aba6c066a9672f71cf7
| -rw-r--r-- | wpa_supplicant/events.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c index 573ac22b..d671b9bb 100644 --- a/wpa_supplicant/events.c +++ b/wpa_supplicant/events.c @@ -1219,7 +1219,8 @@ static int _wpa_supplicant_event_scan_results(struct wpa_supplicant *wpa_s, } #endif /* CONFIG_NO_RANDOM_POOL */ - if (own_request && wpa_s->scan_res_handler) { + if (own_request && wpa_s->scan_res_handler && + (wpa_s->own_scan_running || !wpa_s->external_scan_running)) { void (*scan_res_handler)(struct wpa_supplicant *wpa_s, struct wpa_scan_results *scan_res); |