From c542d366fde771cfe215dddf92680266bd228721 Mon Sep 17 00:00:00 2001 From: blogic Date: Tue, 24 Nov 2015 18:28:44 +0000 Subject: [PATCH] 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 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47615 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/network/services/hostapd/files/netifd.sh | 3 +++ 1 file changed, 3 insertions(+) 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")" -- 2.11.0