From 8e666c773ddb18bb9b8443963690bc7796fcc1d1 Mon Sep 17 00:00:00 2001
From: Steffen Klassert <steffen.klassert@secunet.com>
Date: Wed, 23 Nov 2011 02:14:50 +0000
Subject: [PATCH] --- yaml --- r: 276234 b: refs/heads/master c:
 261663b0ee2ee8e3947f4c11c1a08be18cd2cea1 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 2006f573be1b..1fbb745a1654 100644
--- 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
index 11d1b2080a16..fb47c8f0cd86 100644
--- 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;