]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
FILS: Simplify code paths
authorJouni Malinen <j@w1.fi>
Sun, 28 Feb 2021 16:42:06 +0000 (18:42 +0200)
committerJouni Malinen <j@w1.fi>
Sun, 28 Feb 2021 16:42:06 +0000 (18:42 +0200)
Use a shared code path for freeing the wpa_ie buffer to avoid
unnecessary complexity with a separate return for the non-FILS case.

Signed-off-by: Jouni Malinen <j@w1.fi>
wpa_supplicant/wpa_supplicant.c

index e1497e1f5a07f1fbb12ab3562490ed71f0195993..40068984bbcea82a1734d8d06bc493a85784146a 100644 (file)
@@ -3312,13 +3312,11 @@ static void wpas_update_fils_connect_params(struct wpa_supplicant *wpa_s)
        if (!wpa_ie)
                return;
 
-       if (params.auth_alg != WPA_AUTH_ALG_FILS) {
-               os_free(wpa_ie);
-               return;
+       if (params.auth_alg == WPA_AUTH_ALG_FILS) {
+               wpa_s->auth_alg = params.auth_alg;
+               wpa_drv_update_connect_params(wpa_s, &params, mask);
        }
 
-       wpa_s->auth_alg = params.auth_alg;
-       wpa_drv_update_connect_params(wpa_s, &params, mask);
        os_free(wpa_ie);
 }
 #endif /* CONFIG_FILS && IEEE8021X_EAPOL */