diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2020-01-20 08:43:44 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-01-20 08:43:44 +0100 |
| commit | cb6c82df684e912b10245c13200ef09c9d372fc2 (patch) | |
| tree | 98448cea990ecf17ad39798980ab18165b72b7ac /net/ipv4/ip_tunnel.c | |
| parent | perf/x86/amd: Add support for Large Increment per Cycle Events (diff) | |
| parent | Linux 5.5-rc7 (diff) | |
| download | linux-dev-cb6c82df684e912b10245c13200ef09c9d372fc2.tar.xz linux-dev-cb6c82df684e912b10245c13200ef09c9d372fc2.zip | |
Merge tag 'v5.5-rc7' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/ipv4/ip_tunnel.c')
| -rw-r--r-- | net/ipv4/ip_tunnel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c index 38c02bb62e2c..0fe2a5d3e258 100644 --- a/net/ipv4/ip_tunnel.c +++ b/net/ipv4/ip_tunnel.c @@ -505,7 +505,7 @@ static int tnl_update_pmtu(struct net_device *dev, struct sk_buff *skb, mtu = skb_valid_dst(skb) ? dst_mtu(skb_dst(skb)) : dev->mtu; if (skb_valid_dst(skb)) - skb_dst_update_pmtu(skb, mtu); + skb_dst_update_pmtu_no_confirm(skb, mtu); if (skb->protocol == htons(ETH_P_IP)) { if (!skb_is_gso(skb) && |