From 80a8642153a26d343d463b0ef286f1d9b32f2d2d Mon Sep 17 00:00:00 2001
From: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Date: Mon, 19 May 2008 16:54:29 -0700
Subject: [PATCH] --- yaml --- r: 97092 b: refs/heads/master c:
 a3264435b4ca1ccee54cbef2970f2ba4bef39e2d h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/net/ipv6/route.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3dc7aafdec12..77121385f17d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 44dc19c829c057dc78a5ffacaf851ac4c301eb58
+refs/heads/master: a3264435b4ca1ccee54cbef2970f2ba4bef39e2d
diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c
index 12bba0880345..98aa50c11dd6 100644
--- a/trunk/net/ipv6/route.c
+++ b/trunk/net/ipv6/route.c
@@ -475,7 +475,7 @@ int rt6_route_rcv(struct net_device *dev, u8 *opt, int len,
 	lifetime = ntohl(rinfo->lifetime);
 	if (lifetime == 0xffffffff) {
 		/* infinity */
-	} else if (lifetime > 0x7fffffff/HZ) {
+	} else if (lifetime > 0x7fffffff/HZ - 1) {
 		/* Avoid arithmetic overflow */
 		lifetime = 0x7fffffff/HZ - 1;
 	}