fff-network: Fix mac adresses not set during merge/rebase

Some MAC adresses were forgotten/not updated in a previous
patch. This is fixed now.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Reviewed-by: Tim Niemeyer <tim@tn-x.org>
Reviewed-by: Fabian Bläse <fabian@blaese.de>
This commit is contained in:
Adrian Schmutzler 2017-11-04 00:21:29 +01:00 committed by Tim Niemeyer
parent 915c6f063e
commit 46d8b9b8b2
2 changed files with 4 additions and 5 deletions

View File

@ -13,6 +13,5 @@ BATMAN_PORTS="3 4 0t"
# Load second MAC from Flash because we haven't any Interface with this MAC where we can copy the MAC from
# https://github.com/lede-project/source/pull/613/files#diff-abd6f42f54204372151e73eac0556db1
NEWMAC=$(macaddr_add $(mtd_get_mac_binary product-info 8) 1)
ETHMESHMAC=1
ROUTERMAC=eth0
ETHMESHMAC=$(macaddr_add $(mtd_get_mac_binary product-info 8) 1)
ROUTERMAC=$(cat /sys/class/net/eth0/address)

View File

@ -6,5 +6,5 @@ CLIENT_PORTS="1 2 0t"
WAN_PORTS=
BATMAN_PORTS="3 4 0t"
ETHMESHMAC=eth1
ROUTERMAC=eth0
ETHMESHMAC=$(cat /sys/class/net/eth1/address)
ROUTERMAC=$(cat /sys/class/net/eth0/address)