From mboxrd@z Thu Jan 1 00:00:00 1970 From: William Tu Subject: [PATCH net-next 2/3] bpf: allow disabling tunnel csum for ipv6 Date: Fri, 1 Dec 2017 15:26:09 -0800 Message-ID: <1512170770-7866-3-git-send-email-u9012063@gmail.com> References: <1512170770-7866-1-git-send-email-u9012063@gmail.com> Cc: Daniel Borkmann To: netdev@vger.kernel.org Return-path: Received: from mail-pf0-f193.google.com ([209.85.192.193]:35197 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751432AbdLAX0W (ORCPT ); Fri, 1 Dec 2017 18:26:22 -0500 Received: by mail-pf0-f193.google.com with SMTP id j124so5296887pfc.2 for ; Fri, 01 Dec 2017 15:26:22 -0800 (PST) In-Reply-To: <1512170770-7866-1-git-send-email-u9012063@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: Before the patch, BPF_F_ZERO_CSUM_TX can be used only for ipv4 tunnel. With introduction of ip6gretap collect_md mode, the flag should be also supported for ipv6. Signed-off-by: William Tu Cc: Daniel Borkmann --- net/core/filter.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/net/core/filter.c b/net/core/filter.c index 6a85e67fafce..8ec5a504eb28 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -3026,10 +3026,11 @@ BPF_CALL_4(bpf_skb_set_tunnel_key, struct sk_buff *, skb, IPV6_FLOWLABEL_MASK; } else { info->key.u.ipv4.dst = cpu_to_be32(from->remote_ipv4); - if (flags & BPF_F_ZERO_CSUM_TX) - info->key.tun_flags &= ~TUNNEL_CSUM; } + if (flags & BPF_F_ZERO_CSUM_TX) + info->key.tun_flags &= ~TUNNEL_CSUM; + return 0; } -- 2.7.4