From: John Crispin <john@openwrt.org>
Date: Tue, 24 Nov 2015 18:28:44 +0000 (+0000)
Subject: wpa-supplicant: Get 802.11s ssid information from option mesh_id
X-Git-Tag: reboot~1441
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3afe39af72168e7bab4d032923034be366754754;p=openwrt%2Fstaging%2Fjogo.git

wpa-supplicant: Get 802.11s ssid information from option mesh_id

The scripts for authsae and iw use the option mesh_id to get set the
"meshid" during a mesh join. But the script for wpad-mesh ignores the
option mesh_id and instead uses the option ssid. Unify the mesh
configuration and let the wpa_supplicant script also use the mesh_id from
the configuration.

Signed-off-by: Sven Eckelmann <sven@open-mesh.com>

SVN-Revision: 47615
---

diff --git a/package/network/services/hostapd/files/netifd.sh b/package/network/services/hostapd/files/netifd.sh
index 1c91bbf3c8..5541e4d658 100644
--- a/package/network/services/hostapd/files/netifd.sh
+++ b/package/network/services/hostapd/files/netifd.sh
@@ -581,6 +581,9 @@ wpa_supplicant_add_network() {
 	}
 
 	[[ "$_w_mode" = "mesh" ]] && {
+		json_get_vars mesh_id
+		ssid="${mesh_id}"
+
 		append network_data "mode=5" "$N$T"
 		[ -n "$channel" ] && {
 			freq="$(get_freq "$phy" "$channel")"