From 809d0e7acfa6d177f30367d367619702ed40046d Mon Sep 17 00:00:00 2001
From: Guenter Roeck <guenter.roeck@ericsson.com>
Date: Sun, 21 Mar 2010 20:55:13 -0700
Subject: [PATCH] --- yaml --- r: 188887 b: refs/heads/master c:
 5e016cbf6cffd4a53b7922e0c91b775399d7fe47 h: refs/heads/master i:   188885:
 17421e456a8da21c01650183db7305c3820e695b   188883:
 64a0038c048acc8c9c4b82816654ce4baa5f4d80   188879:
 467ecff081dafc00764808657e44777e7bd646e5 v: v3

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

diff --git a/[refs] b/[refs]
index bbf1fc555b8a..597aeab1639c 100644
--- 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
index 32d396196df8..54fd68c14c87 100644
--- 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)));