From 88802405f321d5527f1cf11d219bea3d41e76d1c Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sun, 22 May 2016 17:44:28 +0300 Subject: [PATCH] scan: Clean up code a bit - phase1 is used in all WPS cases There is no need to have a separate if statement to skip the cases where phase1 is not set. Just check it with the strstr comparison since this case is not really used in practice. Signed-off-by: Jouni Malinen --- wpa_supplicant/scan.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/wpa_supplicant/scan.c b/wpa_supplicant/scan.c index bfee75628..9a3c4c99c 100644 --- a/wpa_supplicant/scan.c +++ b/wpa_supplicant/scan.c @@ -59,10 +59,7 @@ static int wpas_wps_in_use(struct wpa_supplicant *wpa_s, wps = 1; *req_type = wpas_wps_get_req_type(ssid); - if (!ssid->eap.phase1) - continue; - - if (os_strstr(ssid->eap.phase1, "pbc=1")) + if (ssid->eap.phase1 && os_strstr(ssid->eap.phase1, "pbc=1")) return 2; } -- 2.47.3