diff options
| author | wenxu <wenxu@ucloud.cn> | 2020-10-30 11:32:08 +0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2020-10-31 17:19:02 -0700 |
| commit | 20149e9eb68c003eaa09e7c9a49023df40779552 (patch) | |
| tree | f3d533820c0a2d5c8905233edb5c961a55ca16ef /net | |
| parent | 403dc16796f5516acf23d94a1cd9eba564d03210 (diff) | |
| download | linux-stable-20149e9eb68c003eaa09e7c9a49023df40779552.tar.gz linux-stable-20149e9eb68c003eaa09e7c9a49023df40779552.tar.bz2 linux-stable-20149e9eb68c003eaa09e7c9a49023df40779552.zip | |
ip_tunnel: fix over-mtu packet send fail without TUNNEL_DONT_FRAGMENT flags
The tunnel device such as vxlan, bareudp and geneve in the lwt mode set
the outer df only based TUNNEL_DONT_FRAGMENT.
And this was also the behavior for gre device before switching to use
ip_md_tunnel_xmit in commit 962924fa2b7a ("ip_gre: Refactor collect
metatdata mode tunnel xmit to ip_md_tunnel_xmit")
When the ip_gre in lwt mode xmit with ip_md_tunnel_xmi changed the rule and
make the discrepancy between handling of DF by different tunnels. So in the
ip_md_tunnel_xmit should follow the same rule like other tunnels.
Fixes: cfc7381b3002 ("ip_tunnel: add collect_md mode to IPIP tunnel")
Signed-off-by: wenxu <wenxu@ucloud.cn>
Link: https://lore.kernel.org/r/1604028728-31100-1-git-send-email-wenxu@ucloud.cn
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/ip_tunnel.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c index 8b04d1dcfec4..ee65c9225178 100644 --- a/net/ipv4/ip_tunnel.c +++ b/net/ipv4/ip_tunnel.c @@ -608,9 +608,6 @@ void ip_md_tunnel_xmit(struct sk_buff *skb, struct net_device *dev, ttl = ip4_dst_hoplimit(&rt->dst); } - if (!df && skb->protocol == htons(ETH_P_IP)) - df = inner_iph->frag_off & htons(IP_DF); - headroom += LL_RESERVED_SPACE(rt->dst.dev) + rt->dst.header_len; if (headroom > dev->needed_headroom) dev->needed_headroom = headroom; |