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
This commit is contained in:
John Crispin 2015-11-24 18:28:44 +00:00
parent 939175e9f2
commit 3afe39af72

View File

@ -581,6 +581,9 @@ wpa_supplicant_add_network() {
} }
[[ "$_w_mode" = "mesh" ]] && { [[ "$_w_mode" = "mesh" ]] && {
json_get_vars mesh_id
ssid="${mesh_id}"
append network_data "mode=5" "$N$T" append network_data "mode=5" "$N$T"
[ -n "$channel" ] && { [ -n "$channel" ] && {
freq="$(get_freq "$phy" "$channel")" freq="$(get_freq "$phy" "$channel")"