From: Paul Wassi <p.wassi@gmx.at>
Date: Wed, 2 Jan 2019 12:23:51 +0000 (+0100)
Subject: ath79: merge cases in 02_network
X-Git-Tag: v19.07.0-rc1~1672
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=eb1887be93a765b4b86ecad14dd72a5a72d6870e;p=oweals%2Fopenwrt.git

ath79: merge cases in 02_network

Merge some duplicate cases in /etc/board.d/02_network

Signed-off-by: Paul Wassi <p.wassi@gmx.at>
---

diff --git a/target/linux/ath79/base-files/etc/board.d/02_network b/target/linux/ath79/base-files/etc/board.d/02_network
index 6776506893..97d1390106 100755
--- a/target/linux/ath79/base-files/etc/board.d/02_network
+++ b/target/linux/ath79/base-files/etc/board.d/02_network
@@ -35,6 +35,7 @@ ath79_setup_interfaces()
 		ucidef_set_interface_lan "eth0"
 		;;
 	avm,fritz4020|\
+	pcs,cr3000|\
 	tplink,archer-c58-v1|\
 	tplink,archer-c59-v1)
 		ucidef_set_interface_wan "eth0"
@@ -97,7 +98,8 @@ ath79_setup_interfaces()
 	glinet,gl-ar300m-nor|\
 	glinet,gl-x750|\
 	tplink,tl-wr810n-v1|\
-	tplink,tl-wr810n-v2)
+	tplink,tl-wr810n-v2|\
+	ubnt,routerstation)
 		ucidef_set_interfaces_lan_wan "eth1" "eth0"
 		;;
 	glinet,gl-ar750s)
@@ -125,11 +127,6 @@ ath79_setup_interfaces()
 		ucidef_add_switch "switch0" \
 		"0@eth1" "1:lan" "2:lan" "3:lan:3" "4:lan:4"
 		;;
-	pcs,cr3000)
-		ucidef_add_switch "switch0" \
-			"0@eth1" "1:lan:1" "2:lan:4" "3:lan:3" "4:lan:2"
-		ucidef_set_interface_wan "eth0"
-		;;
 	phicomm,k2t)
 		ucidef_add_switch "switch0" \
 			"0@eth0" "3:lan:1" "5:lan:2" "4:wan"
@@ -147,7 +144,10 @@ ath79_setup_interfaces()
 	buffalo,whr-g301n|\
 	tplink,tl-mr3220-v1|\
 	tplink,tl-mr3420-v1|\
+	tplink,tl-wr741nd-v4|\
 	tplink,tl-wr841-v7|\
+	tplink,tl-wr841-v9|\
+	tplink,tl-wr841-v11|\
 	ubnt,airrouter)
 		ucidef_set_interface_wan "eth0"
 		ucidef_add_switch "switch0" \
@@ -197,19 +197,9 @@ ath79_setup_interfaces()
 		ucidef_add_switch "switch0" \
 			"0@eth1" "1:lan:4" "2:lan:1" "3:lan:2" "4:lan:3"
 		;;
-	tplink,tl-wr741nd-v4|\
-	tplink,tl-wr841-v9|\
-	tplink,tl-wr841-v11)
-		ucidef_set_interface_wan "eth0"
-		ucidef_add_switch "switch0" \
-			"0@eth1" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1"
-		;;
 	tplink,tl-wr941-v2)
 		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" "wan"
 		;;
-	ubnt,routerstation)
-		ucidef_set_interfaces_lan_wan "eth1" "eth0"
-		;;
 	ubnt,routerstation-pro)
 		ucidef_set_interface_wan "eth0"
 		ucidef_add_switch "switch0" \