bpf: move bpf csum flag check
authorWilliam Tu <u9012063@gmail.com>
Mon, 4 Dec 2017 22:18:29 +0000 (14:18 -0800)
committerDaniel Borkmann <daniel@iogearbox.net>
Mon, 4 Dec 2017 22:22:31 +0000 (23:22 +0100)
trivial move the BPF_F_ZERO_CSUM_TX check right below the
'flags & BPF_F_DONT_FRAGMENT', so common tun_flags handling
is logically together.

Signed-off-by: William Tu <u9012063@gmail.com>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
net/core/filter.c

index 8ec5a504eb28c50f616cbc931a2d3bcbb9a76cdf..4d644ad17457b968af8f6ea3f290a512e3fd00e1 100644 (file)
@@ -3013,6 +3013,8 @@ BPF_CALL_4(bpf_skb_set_tunnel_key, struct sk_buff *, skb,
        info->key.tun_flags = TUNNEL_KEY | TUNNEL_CSUM | TUNNEL_NOCACHE;
        if (flags & BPF_F_DONT_FRAGMENT)
                info->key.tun_flags |= TUNNEL_DONT_FRAGMENT;
+       if (flags & BPF_F_ZERO_CSUM_TX)
+               info->key.tun_flags &= ~TUNNEL_CSUM;
 
        info->key.tun_id = cpu_to_be64(from->tunnel_id);
        info->key.tos = from->tunnel_tos;
@@ -3028,9 +3030,6 @@ BPF_CALL_4(bpf_skb_set_tunnel_key, struct sk_buff *, skb,
                info->key.u.ipv4.dst = cpu_to_be32(from->remote_ipv4);
        }
 
-       if (flags & BPF_F_ZERO_CSUM_TX)
-               info->key.tun_flags &= ~TUNNEL_CSUM;
-
        return 0;
 }