---

yaml --- r: 97093 b: refs/heads/master c: 69cdf8f h: refs/heads/master i: 97091: 2345214 v: v3
git-mirror · May 19, 2008 · fd416e0 · fd416e0
1 parent 80a8642
commit fd416e0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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;