From 90c8526873e51e83ac94c5e380e40422b258bf13 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Wed, 3 Jan 2018 00:37:08 +0100 Subject: [PATCH] fff-network: Calculate IPv6 using ROUTERMAC variable If the mac is read from /sys/class/net/${iface}/address, some devices (WA860RE, Picostation) will not set the fdff addresses. This can be fixed by using the $ROUTERMAC in configurenetwork. Signed-off-by: Adrian Schmutzler Tested-by: Adrian Schmutzler Reviewed-by: Tim Niemeyer --- src/packages/fff/fff-network/files/usr/sbin/configurenetwork | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/packages/fff/fff-network/files/usr/sbin/configurenetwork b/src/packages/fff/fff-network/files/usr/sbin/configurenetwork index c7062427..f318d8e0 100755 --- a/src/packages/fff/fff-network/files/usr/sbin/configurenetwork +++ b/src/packages/fff/fff-network/files/usr/sbin/configurenetwork @@ -220,8 +220,7 @@ else prefix="fdff:0::/64" # Set $prefix::MAC as IP - mac="$(cat "/sys/class/net/br-mesh/address")" - addr="$(ipMacAssemble "$prefix" "$mac")" + addr="$(ipMacAssemble "$prefix" "$ROUTERMAC")" ip -6 addr add $addr dev br-mesh uci -q del network.globals @@ -236,7 +235,7 @@ else uci -q add_list network.mesh.ip6addr=$addr # Set $prefix::link-local as IP - addr="$(ipEUIAssemble "$prefix" "$mac")" + addr="$(ipEUIAssemble "$prefix" "$ROUTERMAC")" ip -6 addr add $addr dev br-mesh uci -q add_list network.mesh.ip6addr=$addr