aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2007-10-18 13:20:02 +0000
committerFlorian Fainelli <florian@openwrt.org>2007-10-18 13:20:02 +0000
commit0d2e9a653953fca100cd4c92334594ee4fe1f5ca (patch)
tree69e0b27b0b3281061cf4edc9a4f22ef5c41afdfc /package/base-files
parent0a993680d5c42af9c5d6c7884d00bd8a01e3881a (diff)
downloadupstream-0d2e9a653953fca100cd4c92334594ee4fe1f5ca.tar.gz
upstream-0d2e9a653953fca100cd4c92334594ee4fe1f5ca.tar.bz2
upstream-0d2e9a653953fca100cd4c92334594ee4fe1f5ca.zip
Turn off stp by default, thanks ejka
SVN-Revision: 9345
Diffstat (limited to 'package/base-files')
-rw-r--r--package/base-files/files/etc/config/network1
-rwxr-xr-xpackage/base-files/files/lib/network/config.sh2
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 5d380d1e8b..a35fd2ef9a 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 e750c8a415..f07d92623f 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.