Developing lightweight computation at the DSG edge

Commit 217dacff authored by Roger Pueyo Centelles's avatar Roger Pueyo Centelles
Browse files

Merge branch 'master' into testing


Signed-off-by: default avatarRoger Pueyo Centelles <roger.pueyo@guifi.net>
parents 938348f3 a8bf32fe
......@@ -160,8 +160,8 @@ qmp_get_virtual_iface() {
return;
}
# id_char is the first char of the device: [e]th0, [e]th0.2, [w]lan1a
local id_char=$(echo $device | cut -c 1)
# id_char are the two leading chararacters of the device name: [et]h0, [et]h0.2, [wl]an1a, [la]n1, [wa]n
local id_char=$(echo $device | cut -c 1,2)
# id_num is the number of the device: eth[0], eth[0,2] wlan[1]a
local id_num=$(echo $device | tr -d "[A-z]" | tr - _ | tr . _)
# id_extra are the extra characters after the number: eth0[], eth0.2[], wlan1[a]
......
......@@ -398,7 +398,9 @@ qmp_configure_mesh() {
qmp_set_vlan $dev $vid $viface
}
dev="$(echo $dev | sed -r 's/\./_/g')"
# This is not needed anymore, and caused virtual devices to be incorrectly assigned (fixes #495)
# dev="$(echo $dev | sed -r 's/\./_/g')"
# Configure IPv6 address only if mesh_prefix48 is defined (bmx6 does not need it)
if qmp_uci_test qmp.networks.${protocol_name}_mesh_prefix48; then
local ip6="$(qmp_get_ula96 $(uci get qmp.networks.${protocol_name}_mesh_prefix48):: $primary_mesh_device $ip6_suffix 128)"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment