---

yaml --- r: 349203 b: refs/heads/master c: fa1e492 h: refs/heads/master i: 349201: ab5a3ee 349199: 000a44a v: v3
git-mirror · Jan 17, 2013 · 2bdf5fa · 2bdf5fa
1 parent 2d26c0a
commit 2bdf5fa
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: 38d523e2948162776903349c89d65f7b9370dadb
+refs/heads/master: fa1e492aa3cbafba9f8fc6d05e5b08a3091daf4a
diff --git a/trunk/net/ipv4/route.c b/trunk/net/ipv4/route.c
@@ -912,6 +912,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_metric_locked(dst, RTAX_MTU))
+		return;
+
 	if (dst->dev->mtu < mtu)
 		return;