From 5edddf4175062e61b991ce93b425ddbf87568924 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Mon, 28 Nov 2011 18:09:37 +0200 Subject: [PATCH] Use common code for disabled network case in sched_scan There is no need to implement two copies of the iteration code here. Signed-hostap: Jouni Malinen --- wpa_supplicant/scan.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c index 6d519010a..8aa554e1c 100644 --- a/wpa_supplicant/scan.c +++ b/wpa_supplicant/scan.c @@ -749,11 +749,8 @@ int wpa_supplicant_req_sched_scan(struct wpa_supplicant *wpa_s) } while (ssid) { - if (ssid->disabled) { - wpa_s->prev_sched_ssid = ssid; - ssid = ssid->next; - continue; - } + if (ssid->disabled) + goto next; if (params.num_filter_ssids < wpa_s->max_match_sets && params.filter_ssids && ssid->ssid && ssid->ssid_len) { @@ -788,6 +785,7 @@ int wpa_supplicant_req_sched_scan(struct wpa_supplicant *wpa_s) } } + next: wpa_s->prev_sched_ssid = ssid; ssid = ssid->next; }