aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2013-12-29 15:59:12 (GMT)
committerJouni Malinen <j@w1.fi>2013-12-29 15:59:12 (GMT)
commit3187fd900d7492bdb9934098a9ce2f4975fd8fb2 (patch)
treedf48d2f212da37983c05fae7f1fe5e0cf6a3301d /wpa_supplicant
parentd671a42013f3d8d0aaacd38ca2265d22a506c3fb (diff)
downloadhostap-3187fd900d7492bdb9934098a9ce2f4975fd8fb2.zip
hostap-3187fd900d7492bdb9934098a9ce2f4975fd8fb2.tar.gz
hostap-3187fd900d7492bdb9934098a9ce2f4975fd8fb2.tar.bz2
WPS: Replace wpas_wps_in_progress with identical wpas_wps_searching
There is no point in maintaining two different functions that do practically the same check of WPS state. Signed-hostap: Jouni Malinen <j@w1.fi>
Diffstat (limited to 'wpa_supplicant')
-rw-r--r--wpa_supplicant/scan.c2
-rw-r--r--wpa_supplicant/wps_supplicant.c13
-rw-r--r--wpa_supplicant/wps_supplicant.h1
3 files changed, 1 insertions, 15 deletions
diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c
index 3726857..34c430f 100644
--- a/wpa_supplicant/scan.c
+++ b/wpa_supplicant/scan.c
@@ -1630,7 +1630,7 @@ wpa_supplicant_get_scan_results(struct wpa_supplicant *wpa_s,
filter_scan_res(wpa_s, scan_res);
#ifdef CONFIG_WPS
- if (wpas_wps_in_progress(wpa_s)) {
+ if (wpas_wps_searching(wpa_s)) {
wpa_dbg(wpa_s, MSG_DEBUG, "WPS: Order scan results with WPS "
"provisioning rules");
compar = wpa_scan_result_wps_compar;
diff --git a/wpa_supplicant/wps_supplicant.c b/wpa_supplicant/wps_supplicant.c
index 7ff05d7..fc4ffde 100644
--- a/wpa_supplicant/wps_supplicant.c
+++ b/wpa_supplicant/wps_supplicant.c
@@ -1934,19 +1934,6 @@ int wpas_wps_terminate_pending(struct wpa_supplicant *wpa_s)
}
-int wpas_wps_in_progress(struct wpa_supplicant *wpa_s)
-{
- struct wpa_ssid *ssid;
-
- for (ssid = wpa_s->conf->ssid; ssid; ssid = ssid->next) {
- if (!ssid->disabled && ssid->key_mgmt == WPA_KEY_MGMT_WPS)
- return 1;
- }
-
- return 0;
-}
-
-
void wpas_wps_update_config(struct wpa_supplicant *wpa_s)
{
struct wps_context *wps = wpa_s->wps;
diff --git a/wpa_supplicant/wps_supplicant.h b/wpa_supplicant/wps_supplicant.h
index 2a212ca..3fcfbbe 100644
--- a/wpa_supplicant/wps_supplicant.h
+++ b/wpa_supplicant/wps_supplicant.h
@@ -60,7 +60,6 @@ int wpas_wps_er_config(struct wpa_supplicant *wpa_s, const char *uuid,
struct wpabuf * wpas_wps_er_nfc_config_token(struct wpa_supplicant *wpa_s,
int ndef, const char *uuid);
int wpas_wps_terminate_pending(struct wpa_supplicant *wpa_s);
-int wpas_wps_in_progress(struct wpa_supplicant *wpa_s);
void wpas_wps_update_config(struct wpa_supplicant *wpa_s);
struct wpabuf * wpas_wps_nfc_config_token(struct wpa_supplicant *wpa_s,
int ndef, const char *id_str);