---

yaml --- r: 276234 b: refs/heads/master c: 261663b h: refs/heads/master v: v3
git-mirror · Nov 26, 2011 · 8e666c7 · 8e666c7
1 parent 01972c1
commit 8e666c7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b8400f3718a11c9b0ca400705cddf94f3132c1c3
+refs/heads/master: 261663b0ee2ee8e3947f4c11c1a08be18cd2cea1
diff --git a/trunk/net/ipv4/route.c b/trunk/net/ipv4/route.c
@@ -1816,15 +1816,15 @@ static unsigned int ipv4_default_advmss(const struct dst_entry *dst)
 
 static unsigned int ipv4_mtu(const struct dst_entry *dst)
 {
+	const struct rtable *rt = (const struct rtable *) dst;
 	unsigned int mtu = dst_metric_raw(dst, RTAX_MTU);
 
-	if (mtu)
+	if (mtu && rt_is_output_route(rt))
 		return mtu;
 
 	mtu = dst->dev->mtu;
 
 	if (unlikely(dst_metric_locked(dst, RTAX_MTU))) {
-		const struct rtable *rt = (const struct rtable *) dst;
 
 		if (rt->rt_gateway != rt->rt_dst && mtu > 576)
 			mtu = 576;