Bluetooth: bnep: bnep_add_connection() should verify that it's dealing with l2cap...

[pandora-kernel.git] / net / bridge / br_stp_timer.c

diff --git a/net/bridge/br_stp_timer.c b/net/bridge/br_stp_timer.c
index 58de2a0..c83ee79 100644 (file)
--- a/net/bridge/br_stp_timer.c
+++ b/net/bridge/br_stp_timer.c
@@ -107,7 +107,7 @@ static void br_tcn_timer_expired(unsigned long arg)
 
        br_debug(br, "tcn timer expired\n");
        spin_lock(&br->lock);
-       if (br->dev->flags & IFF_UP) {
+       if (!br_is_root_bridge(br) && (br->dev->flags & IFF_UP)) {
                br_transmit_tcn(br);
 
                mod_timer(&br->tcn_timer,jiffies + br->bridge_hello_time);