diff options
| author | David S. Miller <davem@davemloft.net> | 2020-06-17 23:26:55 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-06-17 23:26:55 +0300 |
| commit | b9d37bbb55b8993d296a86fa21f98fa550b61967 (patch) | |
| tree | 73a93a246e9261c7738595af15e6f5a0cf44115a /include/uapi | |
| parent | 69119673bd50b176ded34032fadd41530fb5af21 (diff) | |
| parent | 8030e250d882db174cbcd88273570ffb36a13080 (diff) | |
| download | linux-b9d37bbb55b8993d296a86fa21f98fa550b61967.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Alexei Starovoitov says:
====================
pull-request: bpf 2020-06-17
The following pull-request contains BPF updates for your *net* tree.
We've added 10 non-merge commits during the last 2 day(s) which contain
a total of 14 files changed, 158 insertions(+), 59 deletions(-).
The main changes are:
1) Important fix for bpf_probe_read_kernel_str() return value, from Andrii.
2) [gs]etsockopt fix for large optlen, from Stanislav.
3) devmap allocation fix, from Toke.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/bpf.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index 19684813faae..974a71342aea 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -3168,7 +3168,7 @@ union bpf_attr { * Return * The id is returned or 0 in case the id could not be retrieved. * - * void *bpf_ringbuf_output(void *ringbuf, void *data, u64 size, u64 flags) + * int bpf_ringbuf_output(void *ringbuf, void *data, u64 size, u64 flags) * Description * Copy *size* bytes from *data* into a ring buffer *ringbuf*. * If BPF_RB_NO_WAKEUP is specified in *flags*, no notification of |