aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2013-12-26 14:38:05 (GMT)
committerJouni Malinen <j@w1.fi>2013-12-26 16:27:48 (GMT)
commit69278f73288631700b6e9c027301f561b42f9609 (patch)
tree24d12bedb586a531078bf4ae13fe2f0d26f53fb9 /wpa_supplicant
parentcef16c47fb6ef3eeec79f0e353ef0341e63dc36c (diff)
downloadhostap-69278f73288631700b6e9c027301f561b42f9609.zip
hostap-69278f73288631700b6e9c027301f561b42f9609.tar.gz
hostap-69278f73288631700b6e9c027301f561b42f9609.tar.bz2
Remove unused last_scan_full
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>
Diffstat (limited to 'wpa_supplicant')
-rw-r--r--wpa_supplicant/bss.c22
-rw-r--r--wpa_supplicant/wpa_supplicant_i.h1
2 files changed, 2 insertions, 21 deletions
diff --git a/wpa_supplicant/bss.c b/wpa_supplicant/bss.c
index df1bf11..033384c 100644
--- a/wpa_supplicant/bss.c
+++ b/wpa_supplicant/bss.c
@@ -732,26 +732,10 @@ void wpa_bss_update_end(struct wpa_supplicant *wpa_s, struct scan_info *info,
{
struct wpa_bss *bss, *n;
- wpa_s->last_scan_full = 0;
os_get_reltime(&wpa_s->last_scan);
if (!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) {
if (wpa_bss_in_use(wpa_s, bss))
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 "
- "last_scan_full=%d",
- wpa_s->last_scan_res_used, wpa_s->last_scan_res_size,
- wpa_s->last_scan_full);
+ wpa_printf(MSG_DEBUG, "BSS: last_scan_res_used=%u/%u",
+ wpa_s->last_scan_res_used, wpa_s->last_scan_res_size);
}
diff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h
index 68f508a..5194e34 100644
--- a/wpa_supplicant/wpa_supplicant_i.h
+++ b/wpa_supplicant/wpa_supplicant_i.h
@@ -408,7 +408,6 @@ struct wpa_supplicant {
struct wpa_bss **last_scan_res;
unsigned int last_scan_res_used;
unsigned int last_scan_res_size;
- int last_scan_full;
struct os_reltime last_scan;
struct wpa_driver_ops *driver;