diff options
author | Jakub Kicinski <kuba@kernel.org> | 2020-10-22 09:51:41 -0700 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2020-10-22 09:51:41 -0700 |
commit | d2775984d0567e8262d11f3e607a4345cc7b467d (patch) | |
tree | 52a136f9abe6810fdd440cd3f6016db8b7740764 /scripts/bpf_helpers_doc.py | |
parent | d9b0e599b2b892422f1cbc5d2658049b895b2b58 (diff) | |
parent | 3652c9a1b1fe6cbdd4510eb220db548bff8704ae (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Daniel Borkmann says:
====================
pull-request: bpf 2020-10-22
1) Fix enforcing NULL check in verifier for new helper return types of
RET_PTR_TO_{BTF_ID,MEM_OR_BTF_ID}_OR_NULL, from Martin KaFai Lau.
2) Fix bpf_redirect_neigh() helper API before it becomes frozen by adding
nexthop information as argument, from Toke Høiland-Jørgensen.
3) Guard & fix compilation of bpf_tail_call_static() when __bpf__ arch is
not defined by compiler or clang too old, from Daniel Borkmann.
4) Remove misplaced break after return in attach_type_to_prog_type(), from
Tom Rix.
====================
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'scripts/bpf_helpers_doc.py')
-rwxr-xr-x | scripts/bpf_helpers_doc.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/bpf_helpers_doc.py b/scripts/bpf_helpers_doc.py index 7d86fdd190be..6769caae142f 100755 --- a/scripts/bpf_helpers_doc.py +++ b/scripts/bpf_helpers_doc.py @@ -453,6 +453,7 @@ class PrinterHelpers(Printer): 'struct bpf_perf_event_data', 'struct bpf_perf_event_value', 'struct bpf_pidns_info', + 'struct bpf_redir_neigh', 'struct bpf_sk_lookup', 'struct bpf_sock', 'struct bpf_sock_addr', |