Messages in this thread Patch in this message | | | Date | Fri, 25 Jul 2008 16:07:23 -0700 | From | Greg KH <> | Subject | [patch 3/9] ipv6: use timer pending |
| |
2.6.25-stable review patch. If anyone has any objections, please let us know.
------------------ From: Stephen Hemminger <shemminger@vyatta.com>
[ 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>
--- net/ipv6/ip6_fib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
--- a/net/ipv6/ip6_fib.c +++ b/net/ipv6/ip6_fib.c @@ -679,7 +679,7 @@ static int fib6_add_rt2node(struct fib6_ static __inline__ void fib6_start_gc(struct rt6_info *rt) { - if (ip6_fib_timer.expires == 0 && + if (!timer_pending(&ip6_fib_timer) && (rt->rt6i_flags & (RTF_EXPIRES|RTF_CACHE))) mod_timer(&ip6_fib_timer, jiffies + init_net.ipv6.sysctl.ip6_rt_gc_interval); @@ -687,7 +687,7 @@ static __inline__ void fib6_start_gc(str void fib6_force_start_gc(void) { - if (ip6_fib_timer.expires == 0) + if (!timer_pending(&ip6_fib_timer)) mod_timer(&ip6_fib_timer, jiffies + init_net.ipv6.sysctl.ip6_rt_gc_interval); } --
| |