[ar71xx] fix dir-825-b1 default network config after r21905

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

diff --git a/package/switch/files/switch.sh b/package/switch/files/switch.sh
index 14bacad..6517ca9 100644 (file)
--- a/package/switch/files/switch.sh
+++ b/package/switch/files/switch.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 #!/bin/sh

-# Copyright (C) 2006-2009 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org

 
 setup_switch_hw() {
        local dev="$1"
 
 setup_switch_hw() {
        local dev="$1"


@@ -13,8 +13,14 @@ setup_switch_hw() {
        [ -d "$proc" ] && {
                echo "$reset"  > "$proc/reset"
                echo "$evlan"  > "$proc/enable_vlan"
        [ -d "$proc" ] && {
                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() {
 }
 
 setup_switch_vlan() {


@@ -25,13 +31,21 @@ setup_switch_vlan() {
        config_get vlan  "$s" vlan
        config_get ports "$s" ports
 
        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() {
                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
        config_load network
        config_foreach setup_switch_hw switch
        config_foreach setup_switch_vlan switch_vlan