diff options
| author | Jouni Malinen <j@w1.fi> | 2015-08-11 18:46:38 (GMT) |
|---|---|---|
| committer | Jouni Malinen <j@w1.fi> | 2015-08-11 18:46:38 (GMT) |
| commit | 0a34b62be9dee23e0adefed002a420edb0953961 (patch) | |
| tree | 6b83ad5a821472f7cc20a0b5c80d774220788ed2 /wpa_supplicant/scan.c | |
| parent | 1fbff0b5c489379784d344eac0644974b8e4f738 (diff) | |
| download | hostap-0a34b62be9dee23e0adefed002a420edb0953961.zip hostap-0a34b62be9dee23e0adefed002a420edb0953961.tar.gz hostap-0a34b62be9dee23e0adefed002a420edb0953961.tar.bz2 | |
Do not allow ap_scan=2 scan processing to stop AP mode operation
wpa_supplicant_assoc_try() would result in the currently operating AP to
get stopped if wpa_supplicant_scan() ends up getting triggered without
MANUAL_SCAN_REQ while operating an AP. With ap_scan=2, this could
resulted in unintentional stopping of AP mode operations, so check
explicitly for that case and skip the wpa_supplicant_assoc_try() call if
needed to avoid this.
Signed-off-by: Jouni Malinen <j@w1.fi>
Diffstat (limited to 'wpa_supplicant/scan.c')
| -rw-r--r-- | wpa_supplicant/scan.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c index 8d0d1a5..d7049a1 100644 --- a/wpa_supplicant/scan.c +++ b/wpa_supplicant/scan.c @@ -808,6 +808,9 @@ static void wpa_supplicant_scan(void *eloop_ctx, void *timeout_ctx) } if (wpa_s->last_scan_req != MANUAL_SCAN_REQ && +#ifdef CONFIG_AP + !wpa_s->ap_iface && +#endif /* CONFIG_AP */ wpa_s->conf->ap_scan == 2) { wpa_s->connect_without_scan = NULL; wpa_s->prev_scan_wildcard = 0; |