From: Peter Oh <peter.oh@bowerswilkins.com>
Date: Mon, 27 Aug 2018 21:28:42 +0000 (-0700)
Subject: mesh: Set interface type to mesh before setting interface
X-Git-Tag: hostap_2_8~588
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ba4a25e5d08668e58af6d88312472cf9733d55b;p=thirdparty%2Fhostap.git

mesh: Set interface type to mesh before setting interface

Correct interface type is required to start DFS CAC that can be
triggered during interface setup.

Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
---

diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c
index 177ac3145..f92be214d 100644
--- a/wpa_supplicant/mesh.c
+++ b/wpa_supplicant/mesh.c
@@ -372,14 +372,14 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s,
 		conf->basic_rates[rate_len] = -1;
 	}
 
-	if (hostapd_setup_interface(ifmsh)) {
-		wpa_printf(MSG_ERROR,
-			   "Failed to initialize hostapd interface for mesh");
+	if (wpa_drv_init_mesh(wpa_s)) {
+		wpa_msg(wpa_s, MSG_ERROR, "Failed to init mesh in driver");
 		return -1;
 	}
 
-	if (wpa_drv_init_mesh(wpa_s)) {
-		wpa_msg(wpa_s, MSG_ERROR, "Failed to init mesh in driver");
+	if (hostapd_setup_interface(ifmsh)) {
+		wpa_printf(MSG_ERROR,
+			   "Failed to initialize hostapd interface for mesh");
 		return -1;
 	}