git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[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
1f49830
..
d0fcde8
100644
(file)
--- a/
net/bridge/br_stp_timer.c
+++ b/
net/bridge/br_stp_timer.c
@@
-14,6
+14,7
@@
*/
#include <linux/kernel.h>
*/
#include <linux/kernel.h>
+#include <linux/times.h>
#include <linux/smp_lock.h>
#include "br_private.h"
#include <linux/smp_lock.h>
#include "br_private.h"
@@
-38,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);
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);
}
if (br->dev->flags & IFF_UP) {
br_config_bpdu_generation(br);
mod_timer(&br->hello_timer, jiffies + br->hello_time);
}
- spin_unlock
_bh
(&br->lock);
+ spin_unlock(&br->lock);
}
static void br_message_age_timer_expired(unsigned long arg)
}
static void br_message_age_timer_expired(unsigned long arg)
@@
-70,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.
*/
* 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);
if (p->state == BR_STATE_DISABLED)
goto unlock;
was_root = br_is_root_bridge(br);
@@
-81,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:
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)
}
static void br_forward_delay_timer_expired(unsigned long arg)
@@
-91,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);
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,
if (p->state == BR_STATE_LISTENING) {
p->state = BR_STATE_LEARNING;
mod_timer(&p->forward_delay_timer,
@@
-102,7
+103,7
@@
static void br_forward_delay_timer_expired(unsigned long arg)
br_topology_change_detection(br);
}
br_log_state(p);
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)
}
static void br_tcn_timer_expired(unsigned long arg)
@@
-110,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);
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);
}
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)
}
static void br_topology_change_timer_expired(unsigned long arg)
@@
-124,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);
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;
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)
}
static void br_hold_timer_expired(unsigned long arg)
@@
-137,44
+138,42
@@
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);
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);
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)
{
}
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);
(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);
(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_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)
{
}
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);
(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);
(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);
}
(unsigned long) p);
}
+
+/* Report ticks left (in USER_HZ) used for API */
+unsigned long br_timer_value(const struct timer_list *timer)
+{
+ return timer_pending(timer)
+ ? jiffies_to_clock_t(timer->expires - jiffies) : 0;
+}