diff options
| author | Stephen Hemminger <shemminger@vyatta.com> | 2008-07-24 00:28:07 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-08-01 12:42:57 -0700 |
| commit | 579effcc0cdade7a32e85e3ab92f16622bf5b625 (patch) | |
| tree | 39aca9dde17916e039888257abfe1d9372ac2f7d /net | |
| parent | 5844cdf899519b1d9eff33fea3a9fe6d06f6d0b5 (diff) | |
| download | linux-stable-579effcc0cdade7a32e85e3ab92f16622bf5b625.tar.gz linux-stable-579effcc0cdade7a32e85e3ab92f16622bf5b625.tar.bz2 linux-stable-579effcc0cdade7a32e85e3ab92f16622bf5b625.zip | |
ipv6: use timer pending
[ Upstream commit 847499ce71bdcc8fc542062df6ebed3e596608dd ]
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/ip6_fib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c index 1ee4fa17c129..918fde4bd83b 100644 --- a/net/ipv6/ip6_fib.c +++ b/net/ipv6/ip6_fib.c @@ -663,7 +663,7 @@ static int fib6_add_rt2node(struct fib6_node *fn, struct rt6_info *rt, 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); @@ -671,7 +671,7 @@ static __inline__ void fib6_start_gc(struct net *net, struct rt6_info *rt) void fib6_force_start_gc(struct net *net) { - if (net->ipv6.ip6_fib_timer->expires == 0) + if (!timer_pending(net->ipv6.ip6_fib_timer)) mod_timer(net->ipv6.ip6_fib_timer, jiffies + net->ipv6.sysctl.ip6_rt_gc_interval); } |