aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services/hostapd
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2015-11-24 18:28:44 +0000
committerJohn Crispin <blogic@openwrt.org>2015-11-24 18:28:44 +0000
commit96e4e6b3f014b2841cf11172f4a9f7564a719c36 (patch)
tree1d0cdd4f4f39f1c6180476acd5968f79134460e1 /package/network/services/hostapd
parent9fbbdfc94455df1e4eb3a1eea27b6bbff696b1e5 (diff)
downloadmaster-187ad058-96e4e6b3f014b2841cf11172f4a9f7564a719c36.tar.gz
master-187ad058-96e4e6b3f014b2841cf11172f4a9f7564a719c36.tar.bz2
master-187ad058-96e4e6b3f014b2841cf11172f4a9f7564a719c36.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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47615 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network/services/hostapd')
-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")"