diff options
| author | David S. Miller | 2015-05-03 04:05:58 +0200 |
|---|---|---|
| committer | David S. Miller | 2015-05-03 04:05:58 +0200 |
| commit | 3715544750e4a250f881254900cccebc57509fde (patch) | |
| tree | 478205aefd34a74a0ed2f236c19291973d519fa4 /net/ipv4/route.c | |
| parent | net: rocker: Use ether_addr_equal (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | kernel-qcow2-linux-3715544750e4a250f881254900cccebc57509fde.tar.gz kernel-qcow2-linux-3715544750e4a250f881254900cccebc57509fde.tar.xz kernel-qcow2-linux-3715544750e4a250f881254900cccebc57509fde.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Merge net into net-next.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/route.c')
| -rw-r--r-- | net/ipv4/route.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 81f513d6f27f..7cad0bf1c71c 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -960,10 +960,7 @@ static void __ip_rt_update_pmtu(struct rtable *rt, struct flowi4 *fl4, u32 mtu) if (dst_metric_locked(dst, RTAX_MTU)) return; - if (dst->dev->mtu < mtu) - return; - - if (rt->rt_pmtu && rt->rt_pmtu < mtu) + if (ipv4_mtu(dst) < mtu) return; if (mtu < ip_rt_min_pmtu) |