From f2c6f78cae8ba2c44a845519e4d0f890beb3c422 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Sat, 26 Jun 2010 11:37:47 +0000
Subject: [PATCH] --- yaml --- r: 203228 b: refs/heads/master c:
 f56619fc72407561b00c52244a2caa53d730bc4a h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index dffba0bf76a5..9709d48dd0b2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a9dbfe08ee17f0dc9ecff647eba3d04afa01200
+refs/heads/master: f56619fc72407561b00c52244a2caa53d730bc4a
diff --git a/trunk/net/ipv6/addrconf.c b/trunk/net/ipv6/addrconf.c
index c20a7c260a8f..51a273fe3d21 100644
--- a/trunk/net/ipv6/addrconf.c
+++ b/trunk/net/ipv6/addrconf.c
@@ -3495,8 +3495,12 @@ static int inet6_fill_ifaddr(struct sk_buff *skb, struct inet6_ifaddr *ifa,
 				preferred -= tval;
 			else
 				preferred = 0;
-			if (valid != INFINITY_LIFE_TIME)
-				valid -= tval;
+			if (valid != INFINITY_LIFE_TIME) {
+				if (valid > tval)
+					valid -= tval;
+				else
+					valid = 0;
+			}
 		}
 	} else {
 		preferred = INFINITY_LIFE_TIME;