From 55d03264d08bc806efdcae029f258dd16d65589f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= <fabian@blaese.de>
Date: Tue, 8 Jun 2021 23:48:38 +0200
Subject: [PATCH] fff-network: use DSA network configuration for devices with
 DSA drivers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Some devices had to be disabled starting with OpenWrt 21.02 due to their
new DSA switch drivers.

As support for DSA configuration has since been added to fff-network,
this makes use of this configuration for devices with DSA drivers.

Signed-off-by: Fabian Bläse <fabian@blaese.de>
Tested-by: Fabian Bläse <fabian@blaese.de>
---
 bsp/ramips-mt7621.bsp                                 |  6 +++---
 src/packages/fff/fff-network/Makefile                 |  2 +-
 .../fff/fff-network/files/lib/functions/fff/cpuport   |  8 ++++----
 .../fff/fff-network/mipsel/network.netgear,r6220      | 11 ++++++-----
 .../fff/fff-network/mipsel/network.ubnt,edgerouter-x  | 11 ++++++-----
 .../fff-network/mipsel/network.ubnt,edgerouter-x-sfp  | 11 ++++++-----
 6 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/bsp/ramips-mt7621.bsp b/bsp/ramips-mt7621.bsp
index 75718001..c06e41a8 100644
--- a/bsp/ramips-mt7621.bsp
+++ b/bsp/ramips-mt7621.bsp
@@ -2,7 +2,7 @@ chipset=ramips
 subtarget=mt7621
 
 images=(
-#        "openwrt-ramips-mt7621-netgear_r6220-squashfs-*"
-#        "openwrt-ramips-mt7621-ubnt_edgerouter-x-squashfs-*"
-#        "openwrt-ramips-mt7621-ubnt_edgerouter-x-sfp-squashfs-*"
+        "openwrt-ramips-mt7621-netgear_r6220-squashfs-*"
+        "openwrt-ramips-mt7621-ubnt_edgerouter-x-squashfs-*"
+        "openwrt-ramips-mt7621-ubnt_edgerouter-x-sfp-squashfs-*"
        )
diff --git a/src/packages/fff/fff-network/Makefile b/src/packages/fff/fff-network/Makefile
index 982e45ab..e5dd825f 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:=46
+PKG_RELEASE:=47
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/src/packages/fff/fff-network/files/lib/functions/fff/cpuport b/src/packages/fff/fff-network/files/lib/functions/fff/cpuport
index fed1051d..3cd2373f 100644
--- a/src/packages/fff/fff-network/files/lib/functions/fff/cpuport
+++ b/src/packages/fff/fff-network/files/lib/functions/fff/cpuport
@@ -7,16 +7,14 @@ get_cpu_port() {
 	local CPUPORT
 
 	case "$BOARD" in
-		netgear,r6220|\
 		tplink,archer-c50-v3|\
 		tplink,archer-c50-v4|\
 		tplink,tl-wr1043nd-v2|\
 		tplink,tl-wr1043nd-v3|\
-		tplink,tl-wr841n-v13|\
-		ubnt,edgerouter-x|\
-		ubnt,edgerouter-x-sfp)
+		tplink,tl-wr841n-v13)
 			CPUPORT="6t"
 			;;
+		netgear,r6220|\
 		tplink,cpe210-v2|\
 		tplink,cpe210-v3|\
 		tplink,tl-mr3020-v1|\
@@ -25,6 +23,8 @@ get_cpu_port() {
 		tplink,tl-wa901nd-v2|\
 		ubnt,bullet-m-ar7240|\
 		ubnt,bullet-m-ar7241|\
+		ubnt,edgerouter-x|\
+		ubnt,edgerouter-x-sfp|\
 		ubnt,nanostation-loco-m|\
 		ubnt,nanostation-loco-m-xw|\
 		ubnt,nanostation-m|\
diff --git a/src/packages/fff/fff-network/mipsel/network.netgear,r6220 b/src/packages/fff/fff-network/mipsel/network.netgear,r6220
index 0ec9f379..3e1569bd 100644
--- a/src/packages/fff/fff-network/mipsel/network.netgear,r6220
+++ b/src/packages/fff/fff-network/mipsel/network.netgear,r6220
@@ -1,9 +1,10 @@
 . /lib/functions/fff/network
 
-WANDEV=eth0
-SWITCHDEV=eth0
-CLIENT_PORTS="6t 0 1"
-WAN_PORTS="6t 4"
-BATMAN_PORTS="6t 2 3"
+WANDEV=switch0
+SWITCHDEV=switch0
+CLIENT_PORTS="lan1 lan2"
+WAN_PORTS="wan"
+BATMAN_PORTS="lan3 lan4"
+DSA=1
 
 ETHMESHMAC=$(macFlipLocalBit "$(cat /sys/class/net/eth0/address)")
diff --git a/src/packages/fff/fff-network/mipsel/network.ubnt,edgerouter-x b/src/packages/fff/fff-network/mipsel/network.ubnt,edgerouter-x
index 95bc073c..d65335f5 100644
--- a/src/packages/fff/fff-network/mipsel/network.ubnt,edgerouter-x
+++ b/src/packages/fff/fff-network/mipsel/network.ubnt,edgerouter-x
@@ -1,5 +1,6 @@
-WANDEV=eth0
-SWITCHDEV=eth0
-CLIENT_PORTS="6t 3 4"
-WAN_PORTS="6t 0"
-BATMAN_PORTS="6t 1 2"
+WANDEV=switch0
+SWITCHDEV=switch0
+CLIENT_PORTS="eth3 eth4"
+WAN_PORTS="eth0"
+BATMAN_PORTS="eth1 eth2"
+DSA=1
diff --git a/src/packages/fff/fff-network/mipsel/network.ubnt,edgerouter-x-sfp b/src/packages/fff/fff-network/mipsel/network.ubnt,edgerouter-x-sfp
index 95bc073c..aa3565af 100644
--- a/src/packages/fff/fff-network/mipsel/network.ubnt,edgerouter-x-sfp
+++ b/src/packages/fff/fff-network/mipsel/network.ubnt,edgerouter-x-sfp
@@ -1,5 +1,6 @@
-WANDEV=eth0
-SWITCHDEV=eth0
-CLIENT_PORTS="6t 3 4"
-WAN_PORTS="6t 0"
-BATMAN_PORTS="6t 1 2"
+WANDEV=switch0
+SWITCHDEV=switch0
+CLIENT_PORTS="eth3 eth4 eth5"
+WAN_PORTS="eth0"
+BATMAN_PORTS="eth1 eth2"
+DSA=1