diff options
author | Andrey Ignatov <rdna@fb.com> | 2018-10-03 18:26:43 -0400 |
---|---|---|
committer | Daniel Borkmann <daniel@iogearbox.net> | 2018-10-04 10:04:16 -0400 |
commit | e5b0863c2064f2d40de9de4862317f9db4ccffff (patch) | |
tree | db5900dbeb05babf22b5797b47fe99808fdea01b /tools/lib | |
parent | eff8190880c005e754d7d1bd315fc53a3ae9f876 (diff) |
libbpf: Use __u32 instead of u32 in bpf_program__load
Make bpf_program__load consistent with other interfaces: use __u32
instead of u32. That in turn fixes build of samples:
In file included from ./samples/bpf/trace_output_user.c:21:0:
./tools/lib/bpf/libbpf.h:132:9: error: unknown type name ‘u32’
u32 kern_version);
^
Fixes: commit 29cd77f41620d ("libbpf: Support loading individual progs")
Signed-off-by: Andrey Ignatov <rdna@fb.com>
Acked-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Diffstat (limited to 'tools/lib')
-rw-r--r-- | tools/lib/bpf/libbpf.c | 2 | ||||
-rw-r--r-- | tools/lib/bpf/libbpf.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 02888d36b805..85de1ebd4cb0 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c | |||
@@ -1379,7 +1379,7 @@ out: | |||
1379 | 1379 | ||
1380 | int | 1380 | int |
1381 | bpf_program__load(struct bpf_program *prog, | 1381 | bpf_program__load(struct bpf_program *prog, |
1382 | char *license, u32 kern_version) | 1382 | char *license, __u32 kern_version) |
1383 | { | 1383 | { |
1384 | int err = 0, fd, i; | 1384 | int err = 0, fd, i; |
1385 | 1385 | ||
diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h index 28f83dd6022b..fbfc2aec0f0d 100644 --- a/tools/lib/bpf/libbpf.h +++ b/tools/lib/bpf/libbpf.h | |||
@@ -129,7 +129,7 @@ void bpf_program__set_ifindex(struct bpf_program *prog, __u32 ifindex); | |||
129 | const char *bpf_program__title(struct bpf_program *prog, bool needs_copy); | 129 | const char *bpf_program__title(struct bpf_program *prog, bool needs_copy); |
130 | 130 | ||
131 | int bpf_program__load(struct bpf_program *prog, char *license, | 131 | int bpf_program__load(struct bpf_program *prog, char *license, |
132 | u32 kern_version); | 132 | __u32 kern_version); |
133 | int bpf_program__fd(struct bpf_program *prog); | 133 | int bpf_program__fd(struct bpf_program *prog); |
134 | int bpf_program__pin_instance(struct bpf_program *prog, const char *path, | 134 | int bpf_program__pin_instance(struct bpf_program *prog, const char *path, |
135 | int instance); | 135 | int instance); |