diff options
| author | David S. Miller <davem@davemloft.net> | 2019-06-20 06:06:27 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-06-20 06:06:27 +0200 |
| commit | dca73a65a68329ee386d3ff473152bac66eaab39 (patch) | |
| tree | 97c41afb932bdd6cbe67e7ffc38bfe5952c97798 /arch/alpha/include/uapi/asm | |
| parent | page_pool: fix compile warning when CONFIG_PAGE_POOL is disabled (diff) | |
| parent | Merge branch 'bpf-bounded-loops' (diff) | |
| download | linux-dca73a65a68329ee386d3ff473152bac66eaab39.tar.xz linux-dca73a65a68329ee386d3ff473152bac66eaab39.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
Alexei Starovoitov says:
====================
pull-request: bpf-next 2019-06-19
The following pull-request contains BPF updates for your *net-next* tree.
The main changes are:
1) new SO_REUSEPORT_DETACH_BPF setsocktopt, from Martin.
2) BTF based map definition, from Andrii.
3) support bpf_map_lookup_elem for xskmap, from Jonathan.
4) bounded loops and scalar precision logic in the verifier, from Alexei.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/alpha/include/uapi/asm')
| -rw-r--r-- | arch/alpha/include/uapi/asm/socket.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/alpha/include/uapi/asm/socket.h b/arch/alpha/include/uapi/asm/socket.h index 976e89b116e5..de6c4df61082 100644 --- a/arch/alpha/include/uapi/asm/socket.h +++ b/arch/alpha/include/uapi/asm/socket.h @@ -122,6 +122,8 @@ #define SO_RCVTIMEO_NEW 66 #define SO_SNDTIMEO_NEW 67 +#define SO_DETACH_REUSEPORT_BPF 68 + #if !defined(__KERNEL__) #if __BITS_PER_LONG == 64 |