---

yaml --- r: 327755 b: refs/heads/master c: 98d75c3 h: refs/heads/master i: 327753: 7859aed 327751: fc6c85d v: v3
git-mirror · Aug 31, 2012 · 1bdb3dc · 1bdb3dc
1 parent 63af4b9
commit 1bdb3dc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a2c240691bfdb9b08e680fb8af3f8c011c60e02
+refs/heads/master: 98d75c3724f9b37cdfdb85f821e10edcb743959e
diff --git a/trunk/net/ipv4/route.c b/trunk/net/ipv4/route.c
@@ -1134,10 +1134,7 @@ static unsigned int ipv4_mtu(const struct dst_entry *dst)
 	const struct rtable *rt = (const struct rtable *) dst;
 	unsigned int mtu = rt->rt_pmtu;
 
-	if (mtu && time_after_eq(jiffies, rt->dst.expires))
-		mtu = 0;
-
-	if (!mtu)
+	if (!mtu || time_after_eq(jiffies, rt->dst.expires))
 		mtu = dst_metric_raw(dst, RTAX_MTU);
 
 	if (mtu && rt_is_output_route(rt))