diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-03-26 21:44:13 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-03-26 21:44:13 -0700 |
| commit | 5133a4a800fd3a5d1ab7c016196fd416af3a3f1c (patch) | |
| tree | ece3cfb648899b67a0e6fd145361744f1c3f6f90 /include/linux | |
| parent | openvswitch: add seqadj extension when NAT is used. (diff) | |
| parent | selftests: bpf: don't depend on hardcoded perf sample_freq (diff) | |
| download | linux-dev-5133a4a800fd3a5d1ab7c016196fd416af3a3f1c.tar.xz linux-dev-5133a4a800fd3a5d1ab7c016196fd416af3a3f1c.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
Alexei Starovoitov says:
====================
pull-request: bpf-next 2019-03-26
The following pull-request contains BPF updates for your *net-next* tree.
The main changes are:
1) introduce bpf_tcp_check_syncookie() helper for XDP and tc, from Lorenz.
2) allow bpf_skb_ecn_set_ce() in tc, from Peter.
3) numerous bpf tc tunneling improvements, from Willem.
4) and other miscellaneous improvements from Adrian, Alan, Daniel, Ivan, Stanislav.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/bpf.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/bpf.h b/include/linux/bpf.h index f02367faa58d..f62897198844 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -205,6 +205,7 @@ enum bpf_return_type { RET_PTR_TO_MAP_VALUE_OR_NULL, /* returns a pointer to map elem value or NULL */ RET_PTR_TO_SOCKET_OR_NULL, /* returns a pointer to a socket or NULL */ RET_PTR_TO_TCP_SOCK_OR_NULL, /* returns a pointer to a tcp_sock or NULL */ + RET_PTR_TO_SOCK_COMMON_OR_NULL, /* returns a pointer to a sock_common or NULL */ }; /* eBPF function prototype used by verifier to allow BPF_CALLs from eBPF programs |