linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / net / bridge / br_stp_timer.c

diff --git a/net/bridge/br_stp_timer.c b/net/bridge/br_stp_timer.c
index d0fcde8..9bef55f 100644 (file)
--- a/net/bridge/br_stp_timer.c
+++ b/net/bridge/br_stp_timer.c
@@ -39,13 +39,13 @@ static void br_hello_timer_expired(unsigned long arg)
        struct net_bridge *br = (struct net_bridge *)arg;
        
        pr_debug("%s: hello timer expired\n", br->dev->name);
-       spin_lock(&br->lock);
+       spin_lock_bh(&br->lock);
        if (br->dev->flags & IFF_UP) {
                br_config_bpdu_generation(br);
 
                mod_timer(&br->hello_timer, jiffies + br->hello_time);
        }
-       spin_unlock(&br->lock);
+       spin_unlock_bh(&br->lock);
 }
 
 static void br_message_age_timer_expired(unsigned long arg)
@@ -71,7 +71,7 @@ static void br_message_age_timer_expired(unsigned long arg)
         * running when we are the root bridge. So..  this was_root
         * check is redundant. I'm leaving it in for now, though.
         */
-       spin_lock(&br->lock);
+       spin_lock_bh(&br->lock);
        if (p->state == BR_STATE_DISABLED)
                goto unlock;
        was_root = br_is_root_bridge(br);
@@ -82,7 +82,7 @@ static void br_message_age_timer_expired(unsigned long arg)
        if (br_is_root_bridge(br) && !was_root)
                br_become_root_bridge(br);
  unlock:
-       spin_unlock(&br->lock);
+       spin_unlock_bh(&br->lock);
 }
 
 static void br_forward_delay_timer_expired(unsigned long arg)
@@ -92,7 +92,7 @@ static void br_forward_delay_timer_expired(unsigned long arg)
 
        pr_debug("%s: %d(%s) forward delay timer\n",
                 br->dev->name, p->port_no, p->dev->name);
-       spin_lock(&br->lock);
+       spin_lock_bh(&br->lock);
        if (p->state == BR_STATE_LISTENING) {
                p->state = BR_STATE_LEARNING;
                mod_timer(&p->forward_delay_timer,
@@ -103,7 +103,7 @@ static void br_forward_delay_timer_expired(unsigned long arg)
                        br_topology_change_detection(br);
        }
        br_log_state(p);
-       spin_unlock(&br->lock);
+       spin_unlock_bh(&br->lock);
 }
 
 static void br_tcn_timer_expired(unsigned long arg)
@@ -111,13 +111,13 @@ static void br_tcn_timer_expired(unsigned long arg)
        struct net_bridge *br = (struct net_bridge *) arg;
 
        pr_debug("%s: tcn timer expired\n", br->dev->name);
-       spin_lock(&br->lock);
+       spin_lock_bh(&br->lock);
        if (br->dev->flags & IFF_UP) {
                br_transmit_tcn(br);
        
                mod_timer(&br->tcn_timer,jiffies + br->bridge_hello_time);
        }
-       spin_unlock(&br->lock);
+       spin_unlock_bh(&br->lock);
 }
 
 static void br_topology_change_timer_expired(unsigned long arg)
@@ -125,10 +125,10 @@ static void br_topology_change_timer_expired(unsigned long arg)
        struct net_bridge *br = (struct net_bridge *) arg;
 
        pr_debug("%s: topo change timer expired\n", br->dev->name);
-       spin_lock(&br->lock);
+       spin_lock_bh(&br->lock);
        br->topology_change_detected = 0;
        br->topology_change = 0;
-       spin_unlock(&br->lock);
+       spin_unlock_bh(&br->lock);
 }
 
 static void br_hold_timer_expired(unsigned long arg)
@@ -138,36 +138,45 @@ static void br_hold_timer_expired(unsigned long arg)
        pr_debug("%s: %d(%s) hold timer expired\n", 
                 p->br->dev->name,  p->port_no, p->dev->name);
 
-       spin_lock(&p->br->lock);
+       spin_lock_bh(&p->br->lock);
        if (p->config_pending)
                br_transmit_config(p);
-       spin_unlock(&p->br->lock);
+       spin_unlock_bh(&p->br->lock);
+}
+
+static inline void br_timer_init(struct timer_list *timer,
+                         void (*_function)(unsigned long),
+                         unsigned long _data)
+{
+       init_timer(timer);
+       timer->function = _function;
+       timer->data = _data;
 }
 
 void br_stp_timer_init(struct net_bridge *br)
 {
-       setup_timer(&br->hello_timer, br_hello_timer_expired,
+       br_timer_init(&br->hello_timer, br_hello_timer_expired,
                      (unsigned long) br);
 
-       setup_timer(&br->tcn_timer, br_tcn_timer_expired,
+       br_timer_init(&br->tcn_timer, br_tcn_timer_expired, 
                      (unsigned long) br);
 
-       setup_timer(&br->topology_change_timer,
+       br_timer_init(&br->topology_change_timer,
                      br_topology_change_timer_expired,
                      (unsigned long) br);
 
-       setup_timer(&br->gc_timer, br_fdb_cleanup, (unsigned long) br);
+       br_timer_init(&br->gc_timer, br_fdb_cleanup, (unsigned long) br);
 }
 
 void br_stp_port_timer_init(struct net_bridge_port *p)
 {
-       setup_timer(&p->message_age_timer, br_message_age_timer_expired,
+       br_timer_init(&p->message_age_timer, br_message_age_timer_expired,
                      (unsigned long) p);
 
-       setup_timer(&p->forward_delay_timer, br_forward_delay_timer_expired,
+       br_timer_init(&p->forward_delay_timer, br_forward_delay_timer_expired,
                      (unsigned long) p);
                      
-       setup_timer(&p->hold_timer, br_hold_timer_expired,
+       br_timer_init(&p->hold_timer, br_hold_timer_expired,
                      (unsigned long) p);
 }