From patchwork Fri Nov 3 23:21:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: fff-network: Fix mac adresses not set during merge/rebase From: Adrian Schmutzler X-Patchwork-Id: 665 Message-Id: <1509751289-2721-1-git-send-email-freifunk@adrianschmutzler.de> To: franken-dev@freifunk.net Date: Sat, 4 Nov 2017 00:21:29 +0100 Some MAC adresses were forgotten/not updated in a previous patch. This is fixed now. Signed-off-by: Adrian Schmutzler Reviewed-by: Tim Niemeyer Reviewed-by: Fabian Bläse --- src/packages/fff/fff-network/ar71xx/network.tl-wr1043n-v5 | 5 ++--- src/packages/fff/fff-network/ar71xx/network.tl-wr841-v12 | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr1043n-v5 b/src/packages/fff/fff-network/ar71xx/network.tl-wr1043n-v5 index 28e08a1..2079fd5 100644 --- a/src/packages/fff/fff-network/ar71xx/network.tl-wr1043n-v5 +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr1043n-v5 @@ -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) diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr841-v12 b/src/packages/fff/fff-network/ar71xx/network.tl-wr841-v12 index 4d22fde..4405406 100644 --- a/src/packages/fff/fff-network/ar71xx/network.tl-wr841-v12 +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr841-v12 @@ -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)