From fd416e01595de9b4b1f958966144f57e02cd141b Mon Sep 17 00:00:00 2001
From: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Date: Mon, 19 May 2008 16:55:13 -0700
Subject: [PATCH] --- yaml --- r: 97093 b: refs/heads/master c:
 69cdf8f92a8dd191eee0e834c631d84a140b1121 h: refs/heads/master i:   97091:
 2345214ff69f2b07bbec3c8688c11accc05adcb6 v: v3

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

diff --git a/[refs] b/[refs]
index 77121385f17d..6980976e1150 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3264435b4ca1ccee54cbef2970f2ba4bef39e2d
+refs/heads/master: 69cdf8f92a8dd191eee0e834c631d84a140b1121
diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c
index 98aa50c11dd6..b45a7c0268c5 100644
--- a/trunk/net/ipv6/route.c
+++ b/trunk/net/ipv6/route.c
@@ -2200,7 +2200,9 @@ static int rt6_fill_node(struct sk_buff *skb, struct rt6_info *rt,
 
 	NLA_PUT_U32(skb, RTA_PRIORITY, rt->rt6i_metric);
 
-	expires = rt->rt6i_expires ? rt->rt6i_expires - jiffies : 0;
+	expires = (rt->rt6i_flags & RTF_EXPIRES) ?
+			rt->rt6i_expires - jiffies : 0;
+
 	if (rtnl_put_cacheinfo(skb, &rt->u.dst, 0, 0, 0,
 			       expires, rt->u.dst.error) < 0)
 		goto nla_put_failure;