diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /net/ipv6/ip6_fib.c | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'net/ipv6/ip6_fib.c')
| -rw-r--r-- | net/ipv6/ip6_fib.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c index 1bf6d9a769e6..2cb6149349bf 100644 --- a/net/ipv6/ip6_fib.c +++ b/net/ipv6/ip6_fib.c | |||
| @@ -1105,7 +1105,6 @@ static int fib6_age(struct rt6_info *rt, void *arg) | |||
| 1105 | if (rt->rt6i_flags&RTF_EXPIRES && rt->rt6i_expires) { | 1105 | if (rt->rt6i_flags&RTF_EXPIRES && rt->rt6i_expires) { |
| 1106 | if (time_after(now, rt->rt6i_expires)) { | 1106 | if (time_after(now, rt->rt6i_expires)) { |
| 1107 | RT6_TRACE("expiring %p\n", rt); | 1107 | RT6_TRACE("expiring %p\n", rt); |
| 1108 | rt6_reset_dflt_pointer(rt); | ||
| 1109 | return -1; | 1108 | return -1; |
| 1110 | } | 1109 | } |
| 1111 | gc_args.more++; | 1110 | gc_args.more++; |