| Message ID | 20200312170025.2184-1-freifunk@adrianschmutzler.de |
|---|---|
| State | Accepted |
| Headers | show |
diff --git a/src/packages/fff/fff-network/Makefile b/src/packages/fff/fff-network/Makefile index 95f99e52..31928de8 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:=12 +PKG_RELEASE:=13 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) diff --git a/src/packages/fff/fff-network/ar71xx/network.archer-c7-v2 b/src/packages/fff/fff-network/ar71xx/network.archer-c7-v2 index 27336d99..f774a53e 100644 --- a/src/packages/fff/fff-network/ar71xx/network.archer-c7-v2 +++ b/src/packages/fff/fff-network/ar71xx/network.archer-c7-v2 @@ -7,3 +7,4 @@ WAN_PORTS="1 0t" BATMAN_PORTS="2 3 0t" ROUTERMAC=$(cat /sys/class/net/eth1/address) +ETHMESHMAC=$(cat /sys/class/net/eth0/address)
Reviewed-by: Fabian Bläse <fabian@blaese.de> On 12.03.20 18:00, Adrian Schmutzler wrote: > In OpenWrt commit 8a21bc36229d ("ar71xx: fix MAC addresses for > Archer C5 v1, C7 v1/v2, WDR4900 v2") the WiFi MAC addresses for > the Archer C7 v2 were changed. > > This creates an overlap of the LAN und 2.4 GHz MAC addresses, where > the first will also affect the BATMAN interface eth1.3. > > To keep BATMAN interfaces with separate addresses, this patch will > set the ETHMESHMAC from eth0, corresponding to the separate WAN > device we are not using in our firmware anyway. > > ref: https://github.com/openwrt/openwrt/commit/8a21bc36229d3eabad213ae47fddb4d86d76ac > > Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> > --- > src/packages/fff/fff-network/Makefile | 2 +- > src/packages/fff/fff-network/ar71xx/network.archer-c7-v2 | 1 + > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/src/packages/fff/fff-network/Makefile b/src/packages/fff/fff-network/Makefile > index 95f99e52..31928de8 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:=12 > +PKG_RELEASE:=13 > > PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) > > diff --git a/src/packages/fff/fff-network/ar71xx/network.archer-c7-v2 b/src/packages/fff/fff-network/ar71xx/network.archer-c7-v2 > index 27336d99..f774a53e 100644 > --- a/src/packages/fff/fff-network/ar71xx/network.archer-c7-v2 > +++ b/src/packages/fff/fff-network/ar71xx/network.archer-c7-v2 > @@ -7,3 +7,4 @@ WAN_PORTS="1 0t" > BATMAN_PORTS="2 3 0t" > > ROUTERMAC=$(cat /sys/class/net/eth1/address) > +ETHMESHMAC=$(cat /sys/class/net/eth0/address) >
applied.
In OpenWrt commit 8a21bc36229d ("ar71xx: fix MAC addresses for Archer C5 v1, C7 v1/v2, WDR4900 v2") the WiFi MAC addresses for the Archer C7 v2 were changed. This creates an overlap of the LAN und 2.4 GHz MAC addresses, where the first will also affect the BATMAN interface eth1.3. To keep BATMAN interfaces with separate addresses, this patch will set the ETHMESHMAC from eth0, corresponding to the separate WAN device we are not using in our firmware anyway. ref: https://github.com/openwrt/openwrt/commit/8a21bc36229d3eabad213ae47fddb4d86d76ac Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> --- src/packages/fff/fff-network/Makefile | 2 +- src/packages/fff/fff-network/ar71xx/network.archer-c7-v2 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)