aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2014-01-03 10:00:13 (GMT)
committerJouni Malinen <j@w1.fi>2014-01-05 20:34:17 (GMT)
commit06f9acce189b20daee8fe8fd46cd849425304130 (patch)
treeecfcdfb993c20dbc554766eb2b13b44b8684f977 /wpa_supplicant
parentc9b55597374f9d9f76eb316e19c2208afa2bdbef (diff)
downloadhostap-06f9acce189b20daee8fe8fd46cd849425304130.zip
hostap-06f9acce189b20daee8fe8fd46cd849425304130.tar.gz
hostap-06f9acce189b20daee8fe8fd46cd849425304130.tar.bz2
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. Signed-hostap: Jouni Malinen <j@w1.fi>
Diffstat (limited to 'wpa_supplicant')
-rw-r--r--wpa_supplicant/events.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index f8b3d9f..bc1b65e 100644
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -1243,7 +1243,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);