diff --git a/src/packages/fff/fff-network/Makefile b/src/packages/fff/fff-network/Makefile index 49623632..010f49b3 100644 --- a/src/packages/fff/fff-network/Makefile +++ b/src/packages/fff/fff-network/Makefile @@ -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) 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 2079fd55..ec6d6717 100644 --- a/src/packages/fff/fff-network/ar71xx/network.tl-wr1043n-v5 +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr1043n-v5 @@ -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) diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v4 b/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v4 index 4d220760..ec6d6717 100644 --- a/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v4 +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v4 @@ -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)