[PATCH 1/6] ipv6: use timer pending

[Stephen Hemminger <shemminger@vyatta.com>]

[-- Attachment #1: ipv6-timer.patch --]
[-- Type: text/plain, Size: 1178 bytes --]

This fixes the bridge reference count problem and cleanups ipv6 FIB timer management.
Don't use expires field, because it is not a proper way to test,
instead use timer_pending().

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>


--- a/net/ipv6/ip6_fib.c	2008-07-21 11:25:23.000000000 -0700
+++ b/net/ipv6/ip6_fib.c	2008-07-21 11:42:30.000000000 -0700
@@ -661,17 +661,17 @@ static int fib6_add_rt2node(struct fib6_
 
 static __inline__ void fib6_start_gc(struct net *net, struct rt6_info *rt)
 {
-	if (net->ipv6.ip6_fib_timer->expires == 0 &&
+	if (!timer_pending(net->ipv6.ip6_fib_timer) &&
 	    (rt->rt6i_flags & (RTF_EXPIRES|RTF_CACHE)))
-		mod_timer(net->ipv6.ip6_fib_timer, jiffies +
-			  net->ipv6.sysctl.ip6_rt_gc_interval);
+		mod_timer(net->ipv6.ip6_fib_timer,
+			  jiffies + net->ipv6.sysctl.ip6_rt_gc_interval);
 }
 
 void fib6_force_start_gc(struct net *net)
 {
-	if (net->ipv6.ip6_fib_timer->expires == 0)
-		mod_timer(net->ipv6.ip6_fib_timer, jiffies +
-			  net->ipv6.sysctl.ip6_rt_gc_interval);
+	if (!timer_pending(net->ipv6.ip6_fib_timer))
+		mod_timer(net->ipv6.ip6_fib_timer,
+			  jiffies + net->ipv6.sysctl.ip6_rt_gc_interval);
 }
 
 /*

--