diff --git a/[refs] b/[refs] index 804efc8f8a35..3e1aee404f88 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4a2c240691bfdb9b08e680fb8af3f8c011c60e02 +refs/heads/master: 98d75c3724f9b37cdfdb85f821e10edcb743959e diff --git a/trunk/net/ipv4/route.c b/trunk/net/ipv4/route.c index d2d1e153e7c4..dc9549b5eb1c 100644 --- a/trunk/net/ipv4/route.c +++ b/trunk/net/ipv4/route.c @@ -1134,10 +1134,7 @@ static unsigned int ipv4_mtu(const struct dst_entry *dst) const struct rtable *rt = (const struct rtable *) dst; unsigned int mtu = rt->rt_pmtu; - if (mtu && time_after_eq(jiffies, rt->dst.expires)) - mtu = 0; - - if (!mtu) + if (!mtu || time_after_eq(jiffies, rt->dst.expires)) mtu = dst_metric_raw(dst, RTAX_MTU); if (mtu && rt_is_output_route(rt))