fff-network: use DSA network configuration for devices with DSA drivers

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>
This commit is contained in:
Fabian Bläse 2021-06-08 23:48:38 +02:00
parent 15d259b98a
commit 55d03264d0
6 changed files with 26 additions and 23 deletions

View File

@ -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-*"
)

View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=fff-network
PKG_RELEASE:=46
PKG_RELEASE:=47
include $(INCLUDE_DIR)/package.mk

View File

@ -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|\

View File

@ -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)")

View File

@ -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

View File

@ -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