From: Florian Fainelli <florian@openwrt.org>
Date: Thu, 18 Oct 2007 13:20:02 +0000 (+0000)
Subject: Turn off stp by default, thanks ejka
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;hb=4419fda8ce3630fe64beeb86415af6088ef42576

Turn off stp by default, thanks ejka


SVN-Revision: 9345
---

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.