From b3de3bba187af08b33202d5e0d608df5ae3af1a7 Mon Sep 17 00:00:00 2001
From: Steffen Klassert <steffen.klassert@secunet.com>
Date: Sun, 7 Oct 2012 22:48:18 +0000
Subject: [PATCH] --- yaml --- r: 332919 b: refs/heads/master c:
 7f92d334ba19a0d8e96f8f8f092219553367d921 h: refs/heads/master i:   332917:
 d29d362ad0882ccbfd6615857be9122f3072f4e7   332915:
 4e9e5447e324135a105e4fe2b1495fcfc8c267f9   332911:
 bbb82575e0b70f9674dd2da5dec4e32f06f0b80e v: v3

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

diff --git a/[refs] b/[refs]
index bfb2de18b3eb..c46347dabfd8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d851c12b60471188e15e5c8405b289073e8dd025
+refs/heads/master: 7f92d334ba19a0d8e96f8f8f092219553367d921
diff --git a/trunk/net/ipv4/route.c b/trunk/net/ipv4/route.c
index 90ba8358a892..741df67a81ec 100644
--- a/trunk/net/ipv4/route.c
+++ b/trunk/net/ipv4/route.c
@@ -909,6 +909,9 @@ static void __ip_rt_update_pmtu(struct rtable *rt, struct flowi4 *fl4, u32 mtu)
 	struct dst_entry *dst = &rt->dst;
 	struct fib_result res;
 
+	if (dst->dev->mtu < mtu)
+		return;
+
 	if (mtu < ip_rt_min_pmtu)
 		mtu = ip_rt_min_pmtu;