From: Sungbo Eo <mans0n@gorani.run>
Date: Sat, 25 Apr 2020 09:11:12 +0000 (+0900)
Subject: ramips: explicitly disable built-in switch for lan-only devices
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a1693bf626f8cd00363b0b98642b682522dfcf75;p=openwrt%2Fstaging%2Flinusw.git

ramips: explicitly disable built-in switch for lan-only devices

Commit 8f6334eb947a ("ramips: explicitly disable built-in switch when needed")
did not fix rt288x and rt3883 devices. This patch deals with them.

While at it, consolidate duplicate cases in interface setup.

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

diff --git a/target/linux/ramips/rt288x/base-files/etc/board.d/02_network b/target/linux/ramips/rt288x/base-files/etc/board.d/02_network
index 0cc0e0b28b..a769bdbc43 100755
--- a/target/linux/ramips/rt288x/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/rt288x/base-files/etc/board.d/02_network
@@ -26,6 +26,8 @@ ramips_setup_interfaces()
 		;;
 	buffalo,wli-tx4-ag300n|\
 	dlink,dap-1522-a1)
+		ucidef_add_switch "switch0"
+		ucidef_add_switch_attr "switch0" "enable" "false"
 		ucidef_set_interface_lan "eth0"
 		;;
 	*)
diff --git a/target/linux/ramips/rt305x/base-files/etc/board.d/02_network b/target/linux/ramips/rt305x/base-files/etc/board.d/02_network
index d6ba16f7a8..5f18aa98f5 100755
--- a/target/linux/ramips/rt305x/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/rt305x/base-files/etc/board.d/02_network
@@ -48,6 +48,7 @@ ramips_setup_interfaces()
 	hame,mpr-a2|\
 	hauppauge,broadway|\
 	hootoo,ht-tm02|\
+	huawei,d105|\
 	intenso,memory2move|\
 	netgear,wnce2001|\
 	tenda,3g150b|\
@@ -109,11 +110,6 @@ ramips_setup_interfaces()
 		ucidef_add_switch "switch0" \
 			"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "4:wan:5" "6@eth0"
 		;;
-	huawei,d105)
-		ucidef_add_switch "switch0"
-		ucidef_add_switch_attr "switch0" "enable" "false"
-		ucidef_set_interface_lan "eth0"
-		;;
 	huawei,hg255d)
 		ucidef_add_switch "switch0" \
 			"1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "0:wan" "6@eth0"
diff --git a/target/linux/ramips/rt3883/base-files/etc/board.d/02_network b/target/linux/ramips/rt3883/base-files/etc/board.d/02_network
index 873c72cea3..5f364cfc0f 100755
--- a/target/linux/ramips/rt3883/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/rt3883/base-files/etc/board.d/02_network
@@ -27,6 +27,8 @@ ramips_setup_interfaces()
 		;;
 	loewe,wmdr-143n|\
 	omnima,hpm)
+		ucidef_add_switch "switch0"
+		ucidef_add_switch_attr "switch0" "enable" "false"
 		ucidef_set_interface_lan "eth0"
 		;;
 	samsung,cy-swr1100)