Failed in applying to current master (
apply log)
tools/testing/selftests/bpf/network_helpers.c | 67 +++++++++++++++++++
tools/testing/selftests/bpf/network_helpers.h | 3 +
.../selftests/bpf/prog_tests/assign_reuse.c | 12 +---
.../selftests/bpf/prog_tests/bind_perm.c | 11 +--
.../bpf/prog_tests/bpf_iter_setsockopt.c | 13 +---
.../bpf/prog_tests/btf_skc_cls_ingress.c | 6 +-
.../selftests/bpf/prog_tests/crypto_sanity.c | 3 +-
.../selftests/bpf/prog_tests/decap_sanity.c | 6 +-
.../selftests/bpf/prog_tests/fib_lookup.c | 8 +--
.../selftests/bpf/prog_tests/lwt_helpers.h | 26 ++-----
.../selftests/bpf/prog_tests/lwt_redirect.c | 2 -
.../selftests/bpf/prog_tests/lwt_reroute.c | 2 -
.../testing/selftests/bpf/prog_tests/mptcp.c | 22 +-----
.../bpf/prog_tests/ns_current_pid_tgid.c | 9 +--
.../selftests/bpf/prog_tests/setget_sockopt.c | 10 +--
.../selftests/bpf/prog_tests/sk_assign.c | 4 +-
.../selftests/bpf/prog_tests/sock_destroy.c | 9 +--
.../selftests/bpf/prog_tests/sock_fields.c | 13 +---
.../bpf/prog_tests/sock_iter_batch.c | 7 +-
.../bpf/prog_tests/tcp_custom_syncookie.c | 5 +-
.../bpf/prog_tests/tcp_hdr_options.c | 13 +---
.../selftests/bpf/prog_tests/test_tunnel.c | 19 +++---
.../bpf/prog_tests/xdp_dev_bound_only.c | 3 +-
.../bpf/prog_tests/xdp_do_redirect.c | 4 +-
24 files changed, 114 insertions(+), 163 deletions(-)