| Message ID | 1604028728-31100-1-git-send-email-wenxu@ucloud.cn (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 20149e9eb68c003eaa09e7c9a49023df40779552 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net,v2] ip_tunnel: fix over-mtu packet send fail without TUNNEL_DONT_FRAGMENT flags | expand |
On Fri, 30 Oct 2020 11:32:08 +0800 wenxu@ucloud.cn wrote: > From: wenxu <wenxu@ucloud.cn> > > The tunnel dvice such as vxlan, bareudp and geneve in the lwt mode set > the outer df only based TUNNEL_DONT_FRAGMENT. > And this is also the some behavior for gre device before switching to use > ip_md_tunnel_xmit as the following patch. > > 962924f 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> Applied, thanks.
Hello: This patch was applied to netdev/net.git (refs/heads/master): On Fri, 30 Oct 2020 11:32:08 +0800 you wrote: > From: wenxu <wenxu@ucloud.cn> > > The tunnel dvice such as vxlan, bareudp and geneve in the lwt mode set > the outer df only based TUNNEL_DONT_FRAGMENT. > And this is also the some behavior for gre device before switching to use > ip_md_tunnel_xmit as the following patch. > > [...] Here is the summary with links: - [net,v2] ip_tunnel: fix over-mtu packet send fail without TUNNEL_DONT_FRAGMENT flags https://git.kernel.org/netdev/net/c/20149e9eb68c You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c index 8b04d1d..ee65c92 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;