---

yaml --- r: 332919 b: refs/heads/master c: 7f92d33 h: refs/heads/master i: 332917: d29d362 332915: 4e9e544 332911: bbb8257 v: v3
git-mirror · Oct 8, 2012 · b3de3bb · b3de3bb
1 parent 453ba31
commit b3de3bb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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;