X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/f52d66ff00b24111f87c274d3d7085ef2e1d27b1..65ff2ee6a475b57d02b4475d11167a7f6891eb41:/package/switch/files/switch.sh?ds=inline

diff --git a/package/switch/files/switch.sh b/package/switch/files/switch.sh
index a787a8cf3..6517ca985 100644
--- a/package/switch/files/switch.sh
+++ b/package/switch/files/switch.sh
@@ -1,33 +1,52 @@
 #!/bin/sh
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
+
+setup_switch_hw() {
+	local dev="$1"
+	local enable reset evlan
+
+	config_get_bool enable "$dev" enable 1
+	config_get_bool evlan  "$dev" enable_vlan 1
+	config_get_bool reset  "$dev" reset 1
+
+	local proc="/proc/switch/$dev"
+	[ -d "$proc" ] && {
+		echo "$reset"  > "$proc/reset"
+		echo "$evlan"  > "$proc/enable_vlan"
+		[ -f "$proc/enable" ] && echo "$enable" > "$proc/enable"
+	}
+
+	local vlan
+	for vlan in `seq 0 15`; do
+		proc="/proc/switch/$dev/vlan/$vlan/ports"
+		[ -f "$proc" ] && echo "" > "$proc"
+	done
+}
 
 setup_switch_vlan() {
-	DIR="/proc/switch/$CONFIG_SECTION/vlan/$1"
-	[ -d "$DIR" ] || return 0
-	
-	config_get ports "$CONFIG_SECTION" "vlan$1"
-	echo "$ports" > "$DIR/ports"
+	local s="$1"
+	local dev vlan ports
+
+	config_get dev   "$s" device
+	config_get vlan  "$s" vlan
+	config_get ports "$s" ports
+
+	[ -n "$dev" ] && [ -n "$vlan" ] && {
+		ports="${ports%\*}"
+
+		[ "$_vlan_pvid_set" = 1 ] || {
+			ports="$ports*"
+			_vlan_pvid_set=1
+		}
+
+		local proc="/proc/switch/$dev/vlan/$vlan/ports"
+		[ -f "$proc" ] && echo "$ports" > "$proc"
+	}
 }
 
 setup_switch() {
-	config_cb() {
-		case "$1" in
-			switch)
-				[ -n "$2" -a -d "/proc/switch/$2" ] && {
-					echo 1 > "/proc/switch/$2/reset"
-					echo 1 > "/proc/switch/$2/enable"
-					echo 1 > "/proc/switch/$2/enable_vlan"
-					option_cb() {
-						case "$1" in
-							vlan*) setup_switch_vlan "${1##vlan}";;
-						esac
-					}
-				}
-			;;
-			*)
-				option_cb() { return 0; }
-			;;
-		esac
-	}
+	_vlan_pvid_set=0
 	config_load network
+	config_foreach setup_switch_hw switch
+	config_foreach setup_switch_vlan switch_vlan
 }