diff options
| author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-10-18 13:20:02 +0000 |
|---|---|---|
| committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-10-18 13:20:02 +0000 |
| commit | 6d6cdb60aad3fb96c00d961e1047ac9e842a2d18 (patch) | |
| tree | 5ed47445bb121ea83f735fd184fa1919b3531bb4 | |
| parent | 98fb87989b5709d2a3f35e1b9b8aca68d05fb469 (diff) | |
Turn off stp by default, thanks ejka
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9345 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/base-files/files/etc/config/network | 1 | ||||
| -rwxr-xr-x | package/base-files/files/lib/network/config.sh | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/package/base-files/files/etc/config/network b/package/base-files/files/etc/config/network index 5d380d1e8..a35fd2ef9 100644 --- a/package/base-files/files/etc/config/network +++ b/package/base-files/files/etc/config/network @@ -12,4 +12,3 @@ config interface lan option proto static option ipaddr 192.168.1.1 option netmask 255.255.255.0 - option stp on diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh index e750c8a41..f07d92623 100755 --- a/package/base-files/files/lib/network/config.sh +++ b/package/base-files/files/lib/network/config.sh @@ -100,7 +100,7 @@ prepare_interface() { $DEBUG brctl setfd "br-$config" 0 $DEBUG ifconfig "br-$config" up $DEBUG brctl addif "br-$config" "$iface" - $DEBUG brctl stp "br-$config" ${stp:-on} + $DEBUG brctl stp "br-$config" ${stp:-off} # Creating the bridge here will have triggered a hotplug event, which will # result in another setup_interface() call, so we simply stop processing # the current event at this point. |