McUles
/
firmware
forked from freifunk-franken/firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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 <freifunk@adrianschmutzler.de>
Tested-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Reviewed-by: Tim Niemeyer <tim@tn-x.org>
This commit is contained in:
Adrian Schmutzler 2018-01-03 00:37:08 +01:00 committed by Tim Niemeyer
parent 6ad42be496
commit 90c8526873
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/packages/fff/fff-network/files/usr/sbin/configurenetwork
View File

@ -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