Hi,
This patch uses time_after() etc. for comparing jiffies.
Patch is to 2.5.69. Please apply.
--
~Randy
patch_name: ipv6_jiftime.patch
patch_version: 2003-05-06.17:45:04
author: Randy.Dunlap <rddunlap@osdl.org>
description: use time_after() etc. for comparing jiffies;
product: Linux
product_versions: 2.5.69
maintainer: davem@redhat.com
diffstat: =
net/ipv6/ip6_fib.c | 4 ++--
net/ipv6/route.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff -Naur ./net/ipv6/route.c%TIMES ./net/ipv6/route.c
--- ./net/ipv6/route.c%TIMES 2003-05-04 16:53:36.000000000 -0700
+++ ./net/ipv6/route.c 2003-05-06 17:19:30.000000000 -0700
@@ -564,7 +564,7 @@
static unsigned long last_gc;
unsigned long now = jiffies;
- if ((long)(now - last_gc) < ip6_rt_gc_min_interval &&
+ if (time_after(last_gc + ip6_rt_gc_min_interval, now) &&
atomic_read(&ip6_dst_ops.entries) <= ip6_rt_max_size)
goto out;
diff -Naur ./net/ipv6/ip6_fib.c%TIMES ./net/ipv6/ip6_fib.c
--- ./net/ipv6/ip6_fib.c%TIMES 2003-05-06 16:38:01.000000000 -0700
+++ ./net/ipv6/ip6_fib.c 2003-05-06 17:44:09.000000000 -0700
@@ -1179,14 +1179,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;
}
-
: send the line "unsubscribe linux-net" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
