From: Gabor Juhos <juhosg@openwrt.org>
Date: Wed, 22 Feb 2012 19:46:19 +0000 (+0000)
Subject: ramips: merge identical switch configuration entries
X-Git-Tag: reboot~14754
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c0974b46a54111ea52cbf202ada9d737ff1114fc;p=openwrt%2Fstaging%2Fxback.git

ramips: merge identical switch configuration entries

SVN-Revision: 30688
---

diff --git a/target/linux/ramips/base-files/etc/uci-defaults/network b/target/linux/ramips/base-files/etc/uci-defaults/network
index 7a6f08537a..77b65cb3a0 100755
--- a/target/linux/ramips/base-files/etc/uci-defaults/network
+++ b/target/linux/ramips/base-files/etc/uci-defaults/network
@@ -29,21 +29,17 @@ ramips_setup_interfaces()
 		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 		;;
 
-	f5d8235-v1)
-		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
-		ucidef_add_switch "switch0" "1" "1"
-		ucidef_add_switch_vlan "switch0" "1" "1 2 3 4 5t"
-		ucidef_add_switch_vlan "switch0" "2" "0 5t"
-		;;
-
-	f5d8235-v2)
+	f5d8235-v1 | \
+	f5d8235-v2 | \
+	v11st-fe)
 		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 		ucidef_add_switch "switch0" "1" "1"
 		ucidef_add_switch_vlan "switch0" "1" "1 2 3 4 5t"
 		ucidef_add_switch_vlan "switch0" "2" "0 5t"
 		;;
 
-	rt-n15)
+	rt-n15 | \
+	wl-351)
 		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
 		ucidef_add_switch "switch0" "1" "1"
 		ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5t"
@@ -57,24 +53,10 @@ ramips_setup_interfaces()
 		ucidef_add_switch_vlan "switch0" "2" "4 8t"
 		;;
 
-	v11st-fe)
-		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
-		ucidef_add_switch "switch0" "1" "1"
-		ucidef_add_switch_vlan "switch0" "1" "1 2 3 4 5t"
-		ucidef_add_switch_vlan "switch0" "2" "0 5t"
-		;;
-
 	wcr-150gn)
 		ucidef_set_interface_lan_wan "eth0.2" "eth0.1"
 		;;
 
-	wl-351)
-		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
-		ucidef_add_switch "switch0" "1" "1"
-		ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5t"
-		ucidef_add_switch_vlan "switch0" "2" "4 5t"
-		;;
-
 	wli-tx4-ag300n)
 		ucidef_set_interface_lan "eth0"
 		;;