diff --git a/[refs] b/[refs] index 924122bd7f4f..3d460efb216a 100644 --- 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 index 6e4a89c5e27e..259cbeee9a8b 100644 --- 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;