Attachment 313467 Details for Bug 457012 – modified version of the upstream patch

[patch] modified version of the upstream patch

bz457012--ipv6-use_timer_pending_mrg.patch (text/plain), 1.05 KB, created by Luis Claudio R. Goncalves on 2008-08-05 18:03:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Luis Claudio R. Goncalves

Created: 2008-08-05 18:03:44 UTC

Size: 1.05 KB

patch

obsolete

>Adapted the original patch to MRG RT (2.6.24.7)
>
>| ipv6: use timer pending
>|
>| 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: Luis Claudio R. Goncalves <lgoncalv@redhat.com>
>---
>
>diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
>index 4de2b9e..944095c 100644
>--- a/net/ipv6/ip6_fib.c
>+++ b/net/ipv6/ip6_fib.c
>@@ -675,14 +675,14 @@ 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 + ip6_rt_gc_interval);
> }
> 
> void fib6_force_start_gc(void)
> {
>-	if (ip6_fib_timer.expires == 0)
>+	if (!timer_pending(ip6_fib_timer))
> 		mod_timer(&ip6_fib_timer, jiffies + ip6_rt_gc_interval);
> }
>

Actions: View | Diff

Attachments on bug 457012: 313467