bridge br_multicast: IPv6 MLD support.

[safe/jmp/linux-2.6] / net / bridge / br_stp_timer.c

diff --git a/net/bridge/br_stp_timer.c b/net/bridge/br_stp_timer.c
index 9bef55f..772a140 100644 (file)
--- a/net/bridge/br_stp_timer.c
+++ b/net/bridge/br_stp_timer.c
@@ -5,8 +5,6 @@
  *     Authors:
  *     Lennert Buytenhek               <buytenh@gnu.org>
  *
- *     $Id: br_stp_timer.c,v 1.3 2000/05/05 02:17:17 davem Exp $
- *
  *     This program is free software; you can redistribute it and/or
  *     modify it under the terms of the GNU General Public License
  *     as published by the Free Software Foundation; either version
@@ -15,7 +13,6 @@
 
 #include <linux/kernel.h>
 #include <linux/times.h>
-#include <linux/smp_lock.h>
 
 #include "br_private.h"
 #include "br_private_stp.h"
@@ -27,7 +24,7 @@ static int br_is_designated_for_some_port(const struct net_bridge *br)
 
        list_for_each_entry(p, &br->port_list, list) {
                if (p->state != BR_STATE_DISABLED &&
-                   !memcmp(&p->designated_bridge, &br->bridge_id, 8)) 
+                   !memcmp(&p->designated_bridge, &br->bridge_id, 8))
                        return 1;
        }
 
@@ -37,15 +34,15 @@ static int br_is_designated_for_some_port(const struct net_bridge *br)
 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_bh(&br->lock);
+       spin_lock(&br->lock);
        if (br->dev->flags & IFF_UP) {
                br_config_bpdu_generation(br);
 
-               mod_timer(&br->hello_timer, jiffies + br->hello_time);
+               mod_timer(&br->hello_timer, round_jiffies(jiffies + br->hello_time));
        }
-       spin_unlock_bh(&br->lock);
+       spin_unlock(&br->lock);
 }
 
 static void br_message_age_timer_expired(unsigned long arg)
@@ -58,11 +55,11 @@ static void br_message_age_timer_expired(unsigned long arg)
        if (p->state == BR_STATE_DISABLED)
                return;
 
-       
+
        pr_info("%s: neighbor %.2x%.2x.%.2x:%.2x:%.2x:%.2x:%.2x:%.2x lost on port %d(%s)\n",
-               br->dev->name, 
-               id->prio[0], id->prio[1], 
-               id->addr[0], id->addr[1], id->addr[2], 
+               br->dev->name,
+               id->prio[0], id->prio[1],
+               id->addr[0], id->addr[1], id->addr[2],
                id->addr[3], id->addr[4], id->addr[5],
                p->port_no, p->dev->name);
 
@@ -71,7 +68,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_bh(&br->lock);
+       spin_lock(&br->lock);
        if (p->state == BR_STATE_DISABLED)
                goto unlock;
        was_root = br_is_root_bridge(br);
@@ -82,7 +79,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_bh(&br->lock);
+       spin_unlock(&br->lock);
 }
 
 static void br_forward_delay_timer_expired(unsigned long arg)
@@ -92,7 +89,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_bh(&br->lock);
+       spin_lock(&br->lock);
        if (p->state == BR_STATE_LISTENING) {
                p->state = BR_STATE_LEARNING;
                mod_timer(&p->forward_delay_timer,
@@ -103,7 +100,7 @@ static void br_forward_delay_timer_expired(unsigned long arg)
                        br_topology_change_detection(br);
        }
        br_log_state(p);
-       spin_unlock_bh(&br->lock);
+       spin_unlock(&br->lock);
 }
 
 static void br_tcn_timer_expired(unsigned long arg)
@@ -111,13 +108,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_bh(&br->lock);
+       spin_lock(&br->lock);
        if (br->dev->flags & IFF_UP) {
                br_transmit_tcn(br);
-       
+
                mod_timer(&br->tcn_timer,jiffies + br->bridge_hello_time);
        }
-       spin_unlock_bh(&br->lock);
+       spin_unlock(&br->lock);
 }
 
 static void br_topology_change_timer_expired(unsigned long arg)
@@ -125,60 +122,51 @@ 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_bh(&br->lock);
+       spin_lock(&br->lock);
        br->topology_change_detected = 0;
        br->topology_change = 0;
-       spin_unlock_bh(&br->lock);
+       spin_unlock(&br->lock);
 }
 
 static void br_hold_timer_expired(unsigned long arg)
 {
        struct net_bridge_port *p = (struct net_bridge_port *) arg;
 
-       pr_debug("%s: %d(%s) hold timer expired\n", 
+       pr_debug("%s: %d(%s) hold timer expired\n",
                 p->br->dev->name,  p->port_no, p->dev->name);
 
-       spin_lock_bh(&p->br->lock);
+       spin_lock(&p->br->lock);
        if (p->config_pending)
                br_transmit_config(p);
-       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;
+       spin_unlock(&p->br->lock);
 }
 
 void br_stp_timer_init(struct net_bridge *br)
 {
-       br_timer_init(&br->hello_timer, br_hello_timer_expired,
+       setup_timer(&br->hello_timer, br_hello_timer_expired,
                      (unsigned long) br);
 
-       br_timer_init(&br->tcn_timer, br_tcn_timer_expired, 
+       setup_timer(&br->tcn_timer, br_tcn_timer_expired,
                      (unsigned long) br);
 
-       br_timer_init(&br->topology_change_timer,
+       setup_timer(&br->topology_change_timer,
                      br_topology_change_timer_expired,
                      (unsigned long) br);
 
-       br_timer_init(&br->gc_timer, br_fdb_cleanup, (unsigned long) br);
+       setup_timer(&br->gc_timer, br_fdb_cleanup, (unsigned long) br);
 }
 
 void br_stp_port_timer_init(struct net_bridge_port *p)
 {
-       br_timer_init(&p->message_age_timer, br_message_age_timer_expired,
+       setup_timer(&p->message_age_timer, br_message_age_timer_expired,
                      (unsigned long) p);
 
-       br_timer_init(&p->forward_delay_timer, br_forward_delay_timer_expired,
+       setup_timer(&p->forward_delay_timer, br_forward_delay_timer_expired,
                      (unsigned long) p);
-                     
-       br_timer_init(&p->hold_timer, br_hold_timer_expired,
+
+       setup_timer(&p->hold_timer, br_hold_timer_expired,
                      (unsigned long) p);
-}      
+}
 
 /* Report ticks left (in USER_HZ) used for API */
 unsigned long br_timer_value(const struct timer_list *timer)