patch-2_6_7-vs1_9_1_12

[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..9bef55f 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/times.h>
 #include <linux/smp_lock.h>
 
 #include "br_private.h"
@@ -178,3 +179,10 @@ void br_stp_port_timer_init(struct net_bridge_port *p)
        br_timer_init(&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)
+{
+       return timer_pending(timer)
+               ? jiffies_to_clock_t(timer->expires - jiffies) : 0;
+}