aboutsummaryrefslogtreecommitdiffstats
path: root/package/network
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2015-11-24 18:28:44 +0000
committerJohn Crispin <john@openwrt.org>2015-11-24 18:28:44 +0000
commit3afe39af72168e7bab4d032923034be366754754 (patch)
tree13f6f84685b69a664e943de66c76772f5a353f38 /package/network
parent939175e9f253959fa3d68c1bc85cd985680183ba (diff)
downloadupstream-3afe39af72168e7bab4d032923034be366754754.tar.gz
upstream-3afe39af72168e7bab4d032923034be366754754.tar.bz2
upstream-3afe39af72168e7bab4d032923034be366754754.zip
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
Diffstat (limited to 'package/network')
-rw-r--r--package/network/services/hostapd/files/netifd.sh3
1 files changed, 3 insertions, 0 deletions
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")"