X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fkirkwood%2Fbase-files%2Fetc%2Fuci-defaults%2F02_network;h=3491b5807b13105abb63f6d9f1cffe5bc297c56c;hb=ad8f6370de1b67820a2b85feafc6abc6d6ce1992;hp=9fd68459246ef0e41a85f1a5edc5259e3de8cff7;hpb=873202fc0bda88cd4bffa5e17d68c4b4a750fab3;p=openwrt%2Fstaging%2Fluka.git

diff --git a/target/linux/kirkwood/base-files/etc/uci-defaults/02_network b/target/linux/kirkwood/base-files/etc/uci-defaults/02_network
index 9fd6845924..3491b5807b 100644
--- a/target/linux/kirkwood/base-files/etc/uci-defaults/02_network
+++ b/target/linux/kirkwood/base-files/etc/uci-defaults/02_network
@@ -20,19 +20,6 @@ set network.lan6.reqprefix='no'
 EOF
 }
 
-add_port_based_vlan() {
-	local device=$1
-	local vlan=$2
-	local ports=$3
-	uci batch <<EOF
-add network switch_vlan
-set network.@switch_vlan[-1].device='$device'
-set network.@switch_vlan[-1].vlan='$vlan'
-set network.@switch_vlan[-1].ports='$ports'
-set network.@switch_vlan[-1].port_based='1'
-EOF
-}
-
 . /lib/functions/uci-defaults.sh
 . /lib/kirkwood.sh
 
@@ -41,26 +28,26 @@ board=$(kirkwood_board_name)
 ucidef_set_interface_loopback
 
 case "$board" in
-"dockstar")
-	set_lan_dhcp "eth0"
-	;;
-"iconnect")
-	set_lan_dhcp "eth0"
-	;;
-"ib62x0")
-	set_lan_dhcp "eth0"
-	;;
+"dockstar"|\
+"goflexhome"|\
+"goflexnet"|\
+"iconnect"|\
+"ib62x0"|\
+"nsa310s"|\
 "pogo_e02")
 	set_lan_dhcp "eth0"
 	;;
-"ea3500")
+"linksys-audi")
 	ucidef_set_interfaces_lan_wan "eth0" "eth1"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5"
+	ucidef_add_switch_vlan "switch0" "2" "4 6"
 	;;
-"ea4500")
+"linksys-viper")
 	ucidef_set_interfaces_lan_wan "eth0" "eth1"
-	ucidef_add_switch "switch0" "1" "0"
-	add_port_based_vlan "switch0" "1" "0 1 2 3 5"
-	add_port_based_vlan "switch0" "2" "4 6"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5"
+	ucidef_add_switch_vlan "switch0" "2" "4 6"
 	;;
 "guruplug-server-plus")
 	set_lan_dhcp "eth0" "eth1"