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

Remove unused last_scan_full

Browse source 
This parameter was not really used for anything else apart from a debug
message in the same function that set it. In addition, cfg80211 returns
the set of scanned frequencies even for the full scan, so the code that
was setting this conditionally on frequency list not being there was not
really ever entered either.

Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2013-12-26 16:38:05 +02:00
parent cef16c47fb
commit 69278f7328
2 changed files with 2 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
wpa_supplicant/bss.c
View file

@ -732,26 +732,10 @@ void wpa_bss_update_end(struct wpa_supplicant *wpa_s, struct scan_info *info,
{ {
struct wpa_bss *bss, *n; struct wpa_bss *bss, *n;
wpa_s->last_scan_full = 0;
os_get_reltime(&wpa_s->last_scan); os_get_reltime(&wpa_s->last_scan);
if (!new_scan) if (!new_scan)
return; /* do not expire entries without new scan */ return; /* do not expire entries without new scan */
if (info && !info->aborted && !info->freqs) {
size_t i;
if (info->num_ssids == 0) {
wpa_s->last_scan_full = 1;
} else {
for (i = 0; i < info->num_ssids; i++) {
if (info->ssids[i].ssid == NULL ||
info->ssids[i].ssid_len == 0) {
wpa_s->last_scan_full = 1;
break;
}
}
}
}
dl_list_for_each_safe(bss, n, &wpa_s->bss, struct wpa_bss, list) { dl_list_for_each_safe(bss, n, &wpa_s->bss, struct wpa_bss, list) {
if (wpa_bss_in_use(wpa_s, bss)) if (wpa_bss_in_use(wpa_s, bss))
continue; continue;
@ -765,10 +749,8 @@ void wpa_bss_update_end(struct wpa_supplicant *wpa_s, struct scan_info *info,
} }
} }
wpa_printf(MSG_DEBUG, "BSS: last_scan_res_used=%u/%u " wpa_printf(MSG_DEBUG, "BSS: last_scan_res_used=%u/%u",
"last_scan_full=%d", wpa_s->last_scan_res_used, wpa_s->last_scan_res_size);
wpa_s->last_scan_res_used, wpa_s->last_scan_res_size,
wpa_s->last_scan_full);
} }

1
wpa_supplicant/wpa_supplicant_i.h
View file

@ -408,7 +408,6 @@ struct wpa_supplicant {
struct wpa_bss **last_scan_res; struct wpa_bss **last_scan_res;
unsigned int last_scan_res_used; unsigned int last_scan_res_used;
unsigned int last_scan_res_size; unsigned int last_scan_res_size;
int last_scan_full;
struct os_reltime last_scan; struct os_reltime last_scan;
struct wpa_driver_ops *driver; struct wpa_driver_ops *driver;