Commit 792f3dd6 authored by William Tu's avatar William Tu Committed by Daniel Borkmann
Browse files

bpf: move bpf csum flag check 



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: default avatarWilliam Tu <u9012063@gmail.com>
Acked-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent a3fde2ad

net/core/filter.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -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;

	info->key.tun_flags = TUNNEL_KEY | TUNNEL_CSUM | TUNNEL_NOCACHE;

	if (flags & BPF_F_DONT_FRAGMENT)

	if (flags & BPF_F_DONT_FRAGMENT)

		info->key.tun_flags |= TUNNEL_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.tun_id = cpu_to_be64(from->tunnel_id);

	info->key.tos = from->tunnel_tos;

	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);

		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;

	return 0;

}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE