From bdc77efe681d5b88f3256e2bb6e706d4eaf09518 Mon Sep 17 00:00:00 2001
From: Peter Oh <peter.oh@bowerswilkins.com>
Date: Tue, 29 May 2018 14:39:11 -0700
Subject: [PATCH 07/18] mesh: apply channel attributes before running Mesh

This helps mesh interface initializes with correct
channel parameters.

Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
---
 wpa_supplicant/mesh.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/wpa_supplicant/mesh.c
+++ b/wpa_supplicant/mesh.c
@@ -338,6 +338,8 @@ static int wpa_supplicant_mesh_init(stru
 		conf->basic_rates[rate_len] = -1;
 	}
 
+	wpa_supplicant_conf_ap_ht(wpa_s, ssid, conf);
+
 	if (hostapd_setup_interface(ifmsh)) {
 		wpa_printf(MSG_ERROR,
 			   "Failed to initialize hostapd interface for mesh");
@@ -349,8 +351,6 @@ static int wpa_supplicant_mesh_init(stru
 		return -1;
 	}
 
-	wpa_supplicant_conf_ap_ht(wpa_s, ssid, conf);
-
 	return 0;
 out_free:
 	wpa_supplicant_mesh_deinit(wpa_s);
