From: Sungbo Eo <mans0n@gorani.run>
Date: Thu, 16 Dec 2021 13:14:48 +0000 (+0900)
Subject: ramips: mt7620: tidy up 02_network
X-Git-Tag: v22.03.0-rc1~949
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=cc3e390a74818464a0bfc89fc6edb3b1fefed501;p=openwrt%2Fopenwrt.git

ramips: mt7620: tidy up 02_network

* fix alphabetic sorting
* consolidate duplicate cases

Signed-off-by: Sungbo Eo <mans0n@gorani.run>
---

diff --git a/target/linux/ramips/mt7620/base-files/etc/board.d/02_network b/target/linux/ramips/mt7620/base-files/etc/board.d/02_network
index 2d91911766..a00f168672 100644
--- a/target/linux/ramips/mt7620/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/mt7620/base-files/etc/board.d/02_network
@@ -90,15 +90,15 @@ ramips_setup_interfaces()
 		ucidef_add_switch "switch0" \
 			"1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "6@eth0"
 		;;
+	buffalo,whr-1166d)
+		ucidef_add_switch "switch0" \
+			"0:lan" "1:lan" "2:lan" "3:lan" "5:wan" "6@eth0"
+		;;
 	buffalo,whr-300hp2|\
 	buffalo,whr-600d)
 		ucidef_add_switch "switch0" \
 			"0:lan:1" "1:lan:2" "2:lan:3" "3:lan:4" "4:wan:5" "6@eth0"
 		;;
-	buffalo,whr-1166d)
-		ucidef_add_switch "switch0" \
-			"0:lan" "1:lan" "2:lan" "3:lan" "5:wan" "6@eth0"
-		;;
 	comfast,cf-wr800n|\
 	hnet,c108)
 		ucidef_add_switch "switch0" \
@@ -146,7 +146,8 @@ ramips_setup_interfaces()
 			"5:lan" "6@eth0"
 		ucidef_add_switch_attr "switch1" "enable" "false"
 		;;
-	fon,fon2601)
+	fon,fon2601|\
+	vonets,var11n-300)
 		ucidef_add_switch "switch0" \
 			"0:lan" "4:wan" "6@eth0"
 		;;
@@ -205,8 +206,8 @@ ramips_setup_interfaces()
 		ucidef_add_switch "switch0" \
 			"0:lan:3" "1:lan:2" "2:lan:1" "3:wan" "6@eth0"
 		;;
-	tplink,archer-c20i|\
 	tplink,archer-c20-v1|\
+	tplink,archer-c20i|\
 	tplink,archer-c50-v1)
 		ucidef_add_switch "switch0" \
 			"1:lan:3" "2:lan:4" "3:lan:1" "4:lan:2" "0:wan" "6@eth0"
@@ -216,10 +217,6 @@ ramips_setup_interfaces()
 			"0:lan" "1:lan" "2:lan" "3:lan" "6t@eth0"
 		ucidef_set_interface_wan "usb0"
 		;;
-	vonets,var11n-300)
-		ucidef_add_switch "switch0" \
-			"0:lan" "4:wan" "6@eth0"
-		;;
 	wavlink,wl-wn579x3)
 		ucidef_add_switch "switch0" \
 			"5:lan" "4:wan" "6@eth0"
@@ -341,6 +338,7 @@ ramips_setup_macs()
 		wan_mac=$(macaddr_add "$(mtd_get_mac_binary u-boot 0x1fc20)" 2)
 		;;
 	lb-link,bl-w1200|\
+	netis,wf2770|\
 	phicomm,k2-v22.4|\
 	phicomm,k2-v22.5|\
 	phicomm,k2g|\
@@ -359,10 +357,6 @@ ramips_setup_macs()
 	linksys,e1700)
 		wan_mac=$(mtd_get_mac_ascii config WAN_MAC_ADDR)
 		;;
-	netis,wf2770)
-		wan_mac=$(mtd_get_mac_binary factory 0x2e)
-		label_mac=$wan_mac
-		;;
 	tplink,archer-c2-v1|\
 	tplink,archer-c20-v1|\
 	tplink,archer-c20i|\