From 4976618c76b954f2f584360f4e921f4a2b205526 Mon Sep 17 00:00:00 2001 From: Maital Hahn Date: Mon, 20 Jun 2016 16:27:21 +0300 Subject: [PATCH] mesh: Mark wpa_state COMPLETED when mesh join has been performed In mesh interface, the wpa_supplicant state was either DISCONNECT/SCANNING in non-secured connection or AUTHENTICATING in secured connection. The latter prevented the scan. Update the wpa_supplicant state in mesh to be COMPLETED upon initialization. This is similar to the P2P GO case. Signed-off-by: Maital Hahn --- wpa_supplicant/mesh.c | 3 +++ wpa_supplicant/mesh_rsn.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c index bf9beb2cd..dd534d4ea 100644 --- a/wpa_supplicant/mesh.c +++ b/wpa_supplicant/mesh.c @@ -445,6 +445,9 @@ int wpa_supplicant_join_mesh(struct wpa_supplicant *wpa_s, /* hostapd sets the interface down until we associate */ wpa_drv_set_operstate(wpa_s, 1); + if (!ret) + wpa_supplicant_set_state(wpa_s, WPA_COMPLETED); + out: return ret; } diff --git a/wpa_supplicant/mesh_rsn.c b/wpa_supplicant/mesh_rsn.c index c5f5d692b..2eec22759 100644 --- a/wpa_supplicant/mesh_rsn.c +++ b/wpa_supplicant/mesh_rsn.c @@ -363,7 +363,6 @@ int mesh_rsn_auth_sae_sta(struct wpa_supplicant *wpa_s, "AUTH: started authentication with SAE peer: " MACSTR, MAC2STR(sta->addr)); - wpa_supplicant_set_state(wpa_s, WPA_AUTHENTICATING); ret = auth_sae_init_committed(hapd, sta); if (ret) return ret;