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

WPS: Replace wpas_wps_in_progress with identical wpas_wps_searching

Browse source 
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>
This commit is contained in:
Jouni Malinen 2013-12-29 17:59:12 +02:00
parent d671a42013
commit 3187fd900d
3 changed files with 1 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
wpa_supplicant/scan.c
View file

@ -1630,7 +1630,7 @@ wpa_supplicant_get_scan_results(struct wpa_supplicant *wpa_s,
filter_scan_res(wpa_s, scan_res); filter_scan_res(wpa_s, scan_res);
#ifdef CONFIG_WPS #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 " wpa_dbg(wpa_s, MSG_DEBUG, "WPS: Order scan results with WPS "
"provisioning rules"); "provisioning rules");
compar = wpa_scan_result_wps_compar; compar = wpa_scan_result_wps_compar;

13
wpa_supplicant/wps_supplicant.c
View file

@ -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) void wpas_wps_update_config(struct wpa_supplicant *wpa_s)
{ {
struct wps_context *wps = wpa_s->wps; struct wps_context *wps = wpa_s->wps;

1
wpa_supplicant/wps_supplicant.h
View file

@ -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, struct wpabuf * wpas_wps_er_nfc_config_token(struct wpa_supplicant *wpa_s,
int ndef, const char *uuid); int ndef, const char *uuid);
int wpas_wps_terminate_pending(struct wpa_supplicant *wpa_s); 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); void wpas_wps_update_config(struct wpa_supplicant *wpa_s);
struct wpabuf * wpas_wps_nfc_config_token(struct wpa_supplicant *wpa_s, struct wpabuf * wpas_wps_nfc_config_token(struct wpa_supplicant *wpa_s,
int ndef, const char *id_str); int ndef, const char *id_str);