patch-2.4.22 linux-2.4.22/net/ipv6/ip6_fib.c
Next file: linux-2.4.22/net/ipv6/ip6_input.c
Previous file: linux-2.4.22/net/ipv6/exthdrs.c
Back to the patch index
Back to the overall index
- Lines: 44
- Date:
2003-08-25 04:44:44.000000000 -0700
- Orig file:
linux-2.4.21/net/ipv6/ip6_fib.c
- Orig date:
2003-06-13 07:51:39.000000000 -0700
diff -urN linux-2.4.21/net/ipv6/ip6_fib.c linux-2.4.22/net/ipv6/ip6_fib.c
@@ -594,7 +594,7 @@
#ifdef CONFIG_IPV6_SUBTREES
/* Subtree creation failed, probably main tree node
- is orphan. If it is, shot it.
+ is orphan. If it is, shoot it.
*/
st_failure:
if (fn && !(fn->fn_flags&RTN_RTINFO|RTN_ROOT))
@@ -954,7 +954,7 @@
#if RT6_DEBUG >= 2
if (rt->u.dst.obsolete>0) {
- BUG_TRAP(fn==NULL || rt->u.dst.obsolete<=0);
+ BUG_TRAP(fn==NULL);
return -ENOENT;
}
#endif
@@ -980,7 +980,7 @@
}
/*
- * Tree transversal function.
+ * Tree traversal function.
*
* Certainly, it is not interrupt safe.
* However, it is internally reenterable wrt itself and fib6_add/fib6_del.
@@ -1181,14 +1181,14 @@
*/
if (rt->rt6i_flags&RTF_EXPIRES && rt->rt6i_expires) {
- if ((long)(now - rt->rt6i_expires) > 0) {
+ if (time_after(now, rt->rt6i_expires)) {
RT6_TRACE("expiring %p\n", rt);
return -1;
}
gc_args.more++;
} else if (rt->rt6i_flags & RTF_CACHE) {
if (atomic_read(&rt->u.dst.__refcnt) == 0 &&
- (long)(now - rt->u.dst.lastuse) >= gc_args.timeout) {
+ time_after_eq(now, rt->u.dst.lastuse + gc_args.timeout)) {
RT6_TRACE("aging clone %p\n", rt);
return -1;
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)