diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-04-05 11:23:36 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-04-05 11:23:36 +0000 |
| commit | 4318fbda2a7ee51caafdc4eb1f8028a3f0605142 (patch) | |
| tree | cddb50a81d7d1a628cc400519162080c6d87868e /net/ipv6/ip6_fib.c | |
| parent | 36ea5120664550fae6d31f1c6f695e4f8975cb06 (diff) | |
o Merge with Linux 2.1.91.
o First round of bugfixes for the SC/MC CPUs.
o FPU context switch fixes.
o Lazy context switches.
o Faster syscalls.
o Removed dead code.
o Shitloads of other things I forgot ...
Diffstat (limited to 'net/ipv6/ip6_fib.c')
| -rw-r--r-- | net/ipv6/ip6_fib.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c index 9fce1acca..735ceeb5f 100644 --- a/net/ipv6/ip6_fib.c +++ b/net/ipv6/ip6_fib.c @@ -5,7 +5,7 @@ * Authors: * Pedro Roque <roque@di.fc.ul.pt> * - * $Id: ip6_fib.c,v 1.11 1998/03/08 05:56:50 davem Exp $ + * $Id: ip6_fib.c,v 1.12 1998/03/20 09:12:16 davem Exp $ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -418,9 +418,13 @@ static int fib6_add_rt2node(struct fib6_node *fn, struct rt6_info *rt) (iter->rt6i_flowr == rt->rt6i_flowr) && (ipv6_addr_cmp(&iter->rt6i_gateway, &rt->rt6i_gateway) == 0)) { - if (rt->rt6i_expires == 0 || - (long)(rt->rt6i_expires - iter->rt6i_expires) > 0) - rt->rt6i_expires = iter->rt6i_expires; + if (!(iter->rt6i_flags&RTF_EXPIRES)) + return -EEXIST; + iter->rt6i_expires = rt->rt6i_expires; + if (!(rt->rt6i_flags&RTF_EXPIRES)) { + iter->rt6i_flags &= ~RTF_EXPIRES; + iter->rt6i_expires = rt->rt6i_expires; + } return -EEXIST; } } @@ -931,7 +935,8 @@ static int fib6_gc_node(struct fib6_node *fn, int timeout) * Seems, radix tree walking is absolutely broken, * but we will try in any case --ANK */ - if (rt->rt6i_expires && (long)(now - rt->rt6i_expires) < 0) { + if ((rt->rt6i_flags&RTF_EXPIRES) && rt->rt6i_expires + && (long)(now - rt->rt6i_expires) > 0) { struct rt6_info *old; old = rt; |