diff options
| author | Florian Fainelli <florian@openwrt.org> | 2007-10-18 13:07:28 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2007-10-18 13:07:28 +0000 |
| commit | b6a1b8edd175420104994d38d7ba15825553040d (patch) | |
| tree | 20283094f24914481698eb579ad2aba1f671b97d /package/base-files | |
| parent | ffee907666624b9189e8f92bfb3258e32e82663e (diff) | |
| download | master-187ad058-b6a1b8edd175420104994d38d7ba15825553040d.tar.gz master-187ad058-b6a1b8edd175420104994d38d7ba15825553040d.tar.bz2 master-187ad058-b6a1b8edd175420104994d38d7ba15825553040d.zip | |
Turn on stp by default for bridges (#2476)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9343 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files')
| -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, 3 insertions, 0 deletions
diff --git a/package/base-files/files/etc/config/network b/package/base-files/files/etc/config/network index a35fd2ef9a..5d380d1e8b 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 81b60f7470..e750c8a415 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. |