From 539406d96bb2d5b39a6600ff8ea2520a13d1bd02 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Mon, 15 Feb 2021 21:53:20 +0100 Subject: [PATCH] fff-network: fix primary port for Nanostation M MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Migration from ar71xx to ath79 included changes to the ethernet/switch driver for the target. This introduced a peculiar issue where eth0 and eth1 are swapped for several devices. Most of the relevant cases were already covered in 1cf4d762ff09 ("treewide: move devices from ar71xx to ath79"). This switch also affects the Nanostation M, where the PoE-in port is now eth1 und the PoE-out port is eth0. However, no action was taken in the referenced patch, as nobody was aware of it then. Since the Nanostation M is a two-port device, which we cannot implement properly so far, it was implemented as a one-port with the "primary" PoE-in port so far. This was broken by the ath79 introduction and is now fixed in this patch by using the one-port setup on eth1. That way, the PoE-in port can now be switched by ETHMODE as usual again. Note that custom scripts, e.g. to set up the second port, need to be adjusted manually, as that one is eth0 now. Fixes: 1cf4d762ff09 ("treewide: move devices from ar71xx to ath79") Fixes: #109 (gitea) Signed-off-by: Adrian Schmutzler Reviewed-by: Fabian Bläse Tested-by: Fabian Bläse --- src/packages/fff/fff-network/Makefile | 2 +- src/packages/fff/fff-network/mips/network.ubnt,nanostation-m | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/packages/fff/fff-network/Makefile b/src/packages/fff/fff-network/Makefile index 21af16a..4cbd3ec 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:=32 +PKG_RELEASE:=33 include $(INCLUDE_DIR)/package.mk diff --git a/src/packages/fff/fff-network/mips/network.ubnt,nanostation-m b/src/packages/fff/fff-network/mips/network.ubnt,nanostation-m index 372750c..6c28394 100644 --- a/src/packages/fff/fff-network/mips/network.ubnt,nanostation-m +++ b/src/packages/fff/fff-network/mips/network.ubnt,nanostation-m @@ -1,5 +1,5 @@ -WANDEV=eth0 -SWITCHDEV=eth0 +WANDEV=eth1 +SWITCHDEV=eth1 CLIENT_PORTS="" WAN_PORTS="" BATMAN_PORTS=""