dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

[BRIDGE]: fix crash in STP 

Bridge would crash because of uninitailized timer if STP is used and
device was inserted into a bridge before bridge was up. This got
introduced when the delayed port checking was added.  Fix is to not
enable STP on port unless bridge is up.

Bugzilla: http://bugzilla.kernel.org/show_bug.cgi?id=6140
Dup:      http://bugzilla.kernel.org/show_bug.cgi?id=6156

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Stephen Hemminger 2006-03-03 17:14:51 -08:00 committed by David S. Miller
parent 501f74f294
commit 6e86b89084
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
net/bridge/br_if.c
View File

@ -81,26 +81,27 @@ static void port_carrier_check(void *arg)
{
struct net_device *dev = arg;
struct net_bridge_port *p;
struct net_bridge *br;
rtnl_lock();
p = dev->br_port;
if (!p)
goto done;
br = p->br;
if (netif_carrier_ok(p->dev)) {
u32 cost = port_cost(p->dev);
if (netif_carrier_ok(dev))
p->path_cost = port_cost(dev);
spin_lock_bh(&p->br->lock);
if (p->state == BR_STATE_DISABLED) {
p->path_cost = cost;
br_stp_enable_port(p);
if (br->dev->flags & IFF_UP) {
spin_lock_bh(&br->lock);
if (netif_carrier_ok(dev)) {
if (p->state == BR_STATE_DISABLED)
br_stp_enable_port(p);
} else {
if (p->state != BR_STATE_DISABLED)
br_stp_disable_port(p);
}
spin_unlock_bh(&p->br->lock);
} else {
spin_lock_bh(&p->br->lock);
if (p->state != BR_STATE_DISABLED)
br_stp_disable_port(p);
spin_unlock_bh(&p->br->lock);
spin_unlock_bh(&br->lock);
}
done:
rtnl_unlock();