ramips: add support for the ARC FreeStation5 board, also fix WCR-150GN network setup...

[openwrt.git] / package / switch / files / switch.sh

diff --git a/package/switch/files/switch.sh b/package/switch/files/switch.sh
index 14bacad..2563d41 100644 (file)
--- a/package/switch/files/switch.sh
+++ b/package/switch/files/switch.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2006-2009 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 
 setup_switch_hw() {
        local dev="$1"
@@ -11,10 +11,17 @@ setup_switch_hw() {
 
        local proc="/proc/switch/$dev"
        [ -d "$proc" ] && {
+               ifconfig "$dev" up
                echo "$reset"  > "$proc/reset"
                echo "$evlan"  > "$proc/enable_vlan"
-               echo "$enable" > "$proc/enable"
+               [ -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() {
@@ -25,13 +32,21 @@ setup_switch_vlan() {
        config_get vlan  "$s" vlan
        config_get ports "$s" ports
 
-       [ -n "$dev" ] && [ -n "$vlan" ] && { 
+       [ -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() {
+       _vlan_pvid_set=0
        config_load network
        config_foreach setup_switch_hw switch
        config_foreach setup_switch_vlan switch_vlan