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>
This commit is contained in:
Jouni Malinen 2015-08-11 21:46:38 +03:00
parent 1fbff0b5c4
commit 0a34b62be9

View file

@ -808,6 +808,9 @@ static void wpa_supplicant_scan(void *eloop_ctx, void *timeout_ctx)
} }
if (wpa_s->last_scan_req != MANUAL_SCAN_REQ && 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->conf->ap_scan == 2) {
wpa_s->connect_without_scan = NULL; wpa_s->connect_without_scan = NULL;
wpa_s->prev_scan_wildcard = 0; wpa_s->prev_scan_wildcard = 0;