diff options
| author | David S. Miller <[email protected]> | 2019-06-20 04:06:27 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2019-06-20 04:06:27 +0000 |
| commit | dca73a65a68329ee386d3ff473152bac66eaab39 (patch) | |
| tree | 97c41afb932bdd6cbe67e7ffc38bfe5952c97798 /samples/bpf/xdp_router_ipv4_user.c | |
| parent | page_pool: fix compile warning when CONFIG_PAGE_POOL is disabled (diff) | |
| parent | Merge branch 'bpf-bounded-loops' (diff) | |
| download | kernel-dca73a65a68329ee386d3ff473152bac66eaab39.tar.gz kernel-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 <[email protected]>
Diffstat (limited to 'samples/bpf/xdp_router_ipv4_user.c')
| -rw-r--r-- | samples/bpf/xdp_router_ipv4_user.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/samples/bpf/xdp_router_ipv4_user.c b/samples/bpf/xdp_router_ipv4_user.c index 1f66419631c3..1469b66ebad1 100644 --- a/samples/bpf/xdp_router_ipv4_user.c +++ b/samples/bpf/xdp_router_ipv4_user.c @@ -21,7 +21,7 @@ #include <sys/ioctl.h> #include <sys/syscall.h> #include "bpf_util.h" -#include "bpf/libbpf.h" +#include "libbpf.h" #include <sys/resource.h> #include <libgen.h> |