From 73e227cdc8a0f9ea2d23c43446e29fbb7d409cd8 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Thu, 12 Mar 2020 18:29:39 +0100 Subject: [PATCH] fff-network: account for MAC address change of TL-WDR3600/43x0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In OpenWrt commit 27eea249213b ("ar71xx: fix MAC address setup for TL-WDR4300 board") the LAN/WAN MAC addresses for the TL-WDR3600, TL-WDR4300 and TL-WDR4310 were changed. This creates an overlap of the LAN und 5 GHz MAC addresses, where the first will also affect the BATMAN interface eth0.3. To keep BATMAN interfaces with separate addresses, this patch will set the ETHMESHMAC to eth0 +1, corresponding to the virtual WAN device (VLAN 2) OpenWrt sets up (which we aren't using anyway). ref: https://github.com/openwrt/openwrt/commit/27eea249213b04a372491009850926f9282d13 Signed-off-by: Adrian Schmutzler Reviewed-by: Fabian Bläse --- src/packages/fff/fff-network/Makefile | 2 +- src/packages/fff/fff-network/ar71xx/network.tl-wdr3600-v1 | 3 +++ src/packages/fff/fff-network/ar71xx/network.tl-wdr4300-v1 | 3 +++ src/packages/fff/fff-network/ar71xx/network.tl-wdr4310-v1 | 3 +++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/packages/fff/fff-network/Makefile b/src/packages/fff/fff-network/Makefile index cb2d0879..49623632 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:=14 +PKG_RELEASE:=15 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wdr3600-v1 b/src/packages/fff/fff-network/ar71xx/network.tl-wdr3600-v1 index 73e7703e..0ac2c732 100644 --- a/src/packages/fff/fff-network/ar71xx/network.tl-wdr3600-v1 +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wdr3600-v1 @@ -4,4 +4,7 @@ CLIENT_PORTS="0t 4 5" WAN_PORTS="0t 1" BATMAN_PORTS="0t 2 3" +. /lib/functions/system.sh + ROUTERMAC=$(cat /sys/class/ieee80211/phy1/macaddress) +ETHMESHMAC=$(macaddr_add $ROUTERMAC 1) diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wdr4300-v1 b/src/packages/fff/fff-network/ar71xx/network.tl-wdr4300-v1 index 73e7703e..0ac2c732 100644 --- a/src/packages/fff/fff-network/ar71xx/network.tl-wdr4300-v1 +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wdr4300-v1 @@ -4,4 +4,7 @@ CLIENT_PORTS="0t 4 5" WAN_PORTS="0t 1" BATMAN_PORTS="0t 2 3" +. /lib/functions/system.sh + ROUTERMAC=$(cat /sys/class/ieee80211/phy1/macaddress) +ETHMESHMAC=$(macaddr_add $ROUTERMAC 1) diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wdr4310-v1 b/src/packages/fff/fff-network/ar71xx/network.tl-wdr4310-v1 index 73e7703e..0ac2c732 100644 --- a/src/packages/fff/fff-network/ar71xx/network.tl-wdr4310-v1 +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wdr4310-v1 @@ -4,4 +4,7 @@ CLIENT_PORTS="0t 4 5" WAN_PORTS="0t 1" BATMAN_PORTS="0t 2 3" +. /lib/functions/system.sh + ROUTERMAC=$(cat /sys/class/ieee80211/phy1/macaddress) +ETHMESHMAC=$(macaddr_add $ROUTERMAC 1)