Turn on stp by default for bridges (#2476)

SVN-Revision: 9343
master
Florian Fainelli 17 years ago
parent 36a1feebdd
commit c37f550144
  1. 1
      package/base-files/files/etc/config/network
  2. 2
      package/base-files/files/lib/network/config.sh

@ -12,3 +12,4 @@ config interface lan
option proto static option proto static
option ipaddr 192.168.1.1 option ipaddr 192.168.1.1
option netmask 255.255.255.0 option netmask 255.255.255.0
option stp on

@ -88,6 +88,7 @@ prepare_interface() {
# Setup bridging # Setup bridging
config_get iftype "$config" type config_get iftype "$config" type
config_get stp "$config" stp
case "$iftype" in case "$iftype" in
bridge) bridge)
[ -x /usr/sbin/brctl ] && { [ -x /usr/sbin/brctl ] && {
@ -99,6 +100,7 @@ prepare_interface() {
$DEBUG brctl setfd "br-$config" 0 $DEBUG brctl setfd "br-$config" 0
$DEBUG ifconfig "br-$config" up $DEBUG ifconfig "br-$config" up
$DEBUG brctl addif "br-$config" "$iface" $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 # Creating the bridge here will have triggered a hotplug event, which will
# result in another setup_interface() call, so we simply stop processing # result in another setup_interface() call, so we simply stop processing
# the current event at this point. # the current event at this point.

Loading…
Cancel
Save