From 64644b1e9e9d9fb80df8a9d4e512ed6f284dfdfa Mon Sep 17 00:00:00 2001
From: Jens Rosenboom <me@jayr.de>
Date: Thu, 25 Jun 2009 04:55:50 +0000
Subject: [PATCH] --- yaml --- r: 154490 b: refs/heads/master c:
 a1faa69810b2af562b70b2a71c116c7d03575dd3 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 08347e0486de..062cc4394f2f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ac530b3553e0b4dc1e18a32bed57cfa84cd57cb
+refs/heads/master: a1faa69810b2af562b70b2a71c116c7d03575dd3
diff --git a/trunk/net/ipv6/addrconf.c b/trunk/net/ipv6/addrconf.c
index 8c1e86afbbf5..3883b4036a74 100644
--- a/trunk/net/ipv6/addrconf.c
+++ b/trunk/net/ipv6/addrconf.c
@@ -3362,7 +3362,10 @@ static int inet6_fill_ifaddr(struct sk_buff *skb, struct inet6_ifaddr *ifa,
 		valid = ifa->valid_lft;
 		if (preferred != INFINITY_LIFE_TIME) {
 			long tval = (jiffies - ifa->tstamp)/HZ;
-			preferred -= tval;
+			if (preferred > tval)
+				preferred -= tval;
+			else
+				preferred = 0;
 			if (valid != INFINITY_LIFE_TIME)
 				valid -= tval;
 		}