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;