jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Ignore scan results in wpa_supplicant AP mode

Browse source 
This is needed to avoid trying to reassociate based on new scan
results when using wpa_supplicant to control AP mode. This could
happen if something external triggered the driver to run a scan.
This commit is contained in:
Jouni Malinen 2010-07-17 20:32:25 -07:00 committed by Jouni Malinen
parent 979b988ed6
commit 5bc0cdb721
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
wpa_supplicant/events.c
View file

@ -889,6 +889,12 @@ static void wpa_supplicant_event_scan_results(struct wpa_supplicant *wpa_s,
struct wpa_bss *selected; struct wpa_bss *selected;
struct wpa_ssid *ssid = NULL; struct wpa_ssid *ssid = NULL;
struct wpa_scan_results *scan_res; struct wpa_scan_results *scan_res;
int ap = 0;
#ifdef CONFIG_AP
if (wpa_s->ap_iface)
ap = 1;
#endif /* CONFIG_AP */
wpa_supplicant_notify_scanning(wpa_s, 0); wpa_supplicant_notify_scanning(wpa_s, 0);
@ -896,7 +902,7 @@ static void wpa_supplicant_event_scan_results(struct wpa_supplicant *wpa_s,
data ? &data->scan_info : data ? &data->scan_info :
NULL, 1); NULL, 1);
if (scan_res == NULL) { if (scan_res == NULL) {
if (wpa_s->conf->ap_scan == 2) if (wpa_s->conf->ap_scan == 2 || ap)
return; return;
wpa_printf(MSG_DEBUG, "Failed to get scan results - try " wpa_printf(MSG_DEBUG, "Failed to get scan results - try "
"scanning again"); "scanning again");
@ -911,6 +917,12 @@ static void wpa_supplicant_event_scan_results(struct wpa_supplicant *wpa_s,
return; return;
} }
if (ap) {
wpa_printf(MSG_DEBUG, "Ignore scan results in AP mode");
wpa_scan_results_free(scan_res);
return;
}
/* /*
* Don't post the results if this was the initial cached * Don't post the results if this was the initial cached
* and there were no results. * and there were no results.