ramips: merge identical switch configuration entries

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30688 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/ramips/base-files/etc/uci-defaults/network b/target/linux/ramips/base-files/etc/uci-defaults/network
index 7a6f085..77b65cb 100755 (executable)
--- 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"
                ;;