---

yaml --- r: 188887 b: refs/heads/master c: 5e016cb h: refs/heads/master i: 188885: 17421e4 188883: 64a0038 188879: 467ecff v: v3
git-mirror · Mar 22, 2010 · 809d0e7 · 809d0e7
1 parent 30f585f
commit 809d0e7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3a61d47cc37c51834abe537e0ed685829d56ee2
+refs/heads/master: 5e016cbf6cffd4a53b7922e0c91b775399d7fe47
diff --git a/trunk/net/ipv4/route.c b/trunk/net/ipv4/route.c
@@ -1510,7 +1510,8 @@ static struct dst_entry *ipv4_negative_advice(struct dst_entry *dst)
 			ip_rt_put(rt);
 			ret = NULL;
 		} else if ((rt->rt_flags & RTCF_REDIRECTED) ||
-			   rt->u.dst.expires) {
+			   (rt->u.dst.expires &&
+			    time_after_eq(jiffies, rt->u.dst.expires))) {
 			unsigned hash = rt_hash(rt->fl.fl4_dst, rt->fl.fl4_src,
 						rt->fl.oif,
 						rt_genid(dev_net(dst->dev)));