From a998955b8281a0b38c1df2dd902824ced3145e63 Mon Sep 17 00:00:00 2001 From: florian Date: Thu, 18 Oct 2007 13:07:28 +0000 Subject: [PATCH] Turn on stp by default for bridges (#2476) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9343 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/files/etc/config/network | 1 + package/base-files/files/lib/network/config.sh | 2 ++ 2 files changed, 3 insertions(+) diff --git a/package/base-files/files/etc/config/network b/package/base-files/files/etc/config/network index a35fd2ef9..5d380d1e8 100644 --- a/package/base-files/files/etc/config/network +++ b/package/base-files/files/etc/config/network @@ -12,3 +12,4 @@ 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 81b60f747..e750c8a41 100755 --- a/package/base-files/files/lib/network/config.sh +++ b/package/base-files/files/lib/network/config.sh @@ -88,6 +88,7 @@ prepare_interface() { # Setup bridging config_get iftype "$config" type + config_get stp "$config" stp case "$iftype" in bridge) [ -x /usr/sbin/brctl ] && { @@ -99,6 +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} # 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.