fff-network: use static MAC address location for TL-WR1043ND v4

At the moment, the ETHMESHMAC for the TL-WR1043ND v4 is loaded from
the config partition. The data there is written by the stock firmware,
and thus is dependent on the version installed before and may even
vary in position.

Instead, this patch uses the product-info partition, which is not
modified by stock firmware.

While at it, update the sourced library files and the comment for
both v4 and v5.

ref: 53839da46e

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Reviewed-by: Fabian Bläse <fabian@blaese.de>
This commit is contained in:
Adrian Schmutzler 2020-03-12 19:12:38 +01:00 committed by Fabian Bläse
parent 73e227cdc8
commit aa42a39ce2
3 changed files with 8 additions and 10 deletions

View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=fff-network
PKG_RELEASE:=15
PKG_RELEASE:=16
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)

View File

@ -7,11 +7,10 @@ WAN_PORTS="5 0t"
BATMAN_PORTS="3 4 0t"
. /lib/functions/system.sh
. /lib/functions/uci-defaults.sh
. /lib/ar71xx.sh
. /lib/functions.sh
# 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
# Load second MAC address from flash because we haven't any interface with this
# address where we can copy it from
ETHMESHMAC=$(macaddr_add $(mtd_get_mac_binary product-info 8) 1)
ROUTERMAC=$(cat /sys/class/net/eth0/address)

View File

@ -7,11 +7,10 @@ WAN_PORTS="5 0t"
BATMAN_PORTS="3 4 0t"
. /lib/functions/system.sh
. /lib/functions/uci-defaults.sh
. /lib/ar71xx.sh
. /lib/functions.sh
# 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
# Load second MAC address from flash because we haven't any interface with this
# address where we can copy it from
ETHMESHMAC=$(mtd_get_mac_binary config 0x1017c)
ETHMESHMAC=$(macaddr_add $(mtd_get_mac_binary product-info 8) 1)
ROUTERMAC=$(cat /sys/class/net/eth0/address)