diff mbox

mesh: Cannot perform scan on mesh IF while mesh is connected with security

Message ID 1466429241-6062-1-git-send-email-maitalm@ti.com
State Accepted
Headers show

Commit Message

Hahn, Maital June 20, 2016, 1:27 p.m. UTC
In mesh IF, the wpa_s state was either SCANNING in non-secured connection
or AUTHENTICATING in secured connection. The latter prevented the scan.
Updated the wpa_s state in mesh IF to be COMPLETED upon init (same as P2P GO).

Signed-off-by: Maital Hahn <maitalm@ti.com>
---
 wpa_supplicant/mesh.c     | 2 ++
 wpa_supplicant/mesh_rsn.c | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

Comments

Jouni Malinen June 24, 2016, 4:05 p.m. UTC | #1
On Mon, Jun 20, 2016 at 04:27:21PM +0300, Maital Hahn wrote:
> In mesh IF, the wpa_s state was either SCANNING in non-secured connection
> or AUTHENTICATING in secured connection. The latter prevented the scan.
> Updated the wpa_s state in mesh IF to be COMPLETED upon init (same as P2P GO).

Thanks, applied.
diff mbox

Patch

diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c
index bf9beb2..4c4918e 100644
--- a/wpa_supplicant/mesh.c
+++ b/wpa_supplicant/mesh.c
@@ -445,6 +445,8 @@  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);
 
+	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 c5f5d69..2eec227 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;