Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83d994d0 authored by Joe Stringer's avatar Joe Stringer Committed by Arnaldo Carvalho de Melo
Browse files

tools lib bpf: use __u32 from linux/types.h 



Fixes the following issue when building without access to 'u32' type:

./tools/lib/bpf/bpf.h:27:23: error: unknown type name ‘u32’

Signed-off-by: default avatarJoe Stringer <joe@ovn.org>
Acked-by: default avatarWang Nan <wangnan0@huawei.com>
Cc: Alexei Starovoitov <ast@fb.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Link: http://lkml.kernel.org/r/20161209024620.31660-3-joe@ovn.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 0cb34dc2

tools/lib/bpf/bpf.c

+2 −2
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ int bpf_create_map(enum bpf_map_type map_type, int key_size, 


int bpf_load_program(enum bpf_prog_type type, struct bpf_insn *insns,

		     size_t insns_cnt, char *license,

		     u32 kern_version, char *log_buf, size_t log_buf_sz)

		     __u32 kern_version, char *log_buf, size_t log_buf_sz)

{

	int fd;

	union bpf_attr attr;
@@ -98,7 +98,7 @@ int bpf_load_program(enum bpf_prog_type type, struct bpf_insn *insns, 
}



int bpf_map_update_elem(int fd, void *key, void *value,

			u64 flags)

			__u64 flags)

{

	union bpf_attr attr;

tools/lib/bpf/bpf.h

+2 −2
Original line number Diff line number Diff line
@@ -30,11 +30,11 @@ int bpf_create_map(enum bpf_map_type map_type, int key_size, int value_size, 
#define BPF_LOG_BUF_SIZE 65536

int bpf_load_program(enum bpf_prog_type type, struct bpf_insn *insns,

		     size_t insns_cnt, char *license,

		     u32 kern_version, char *log_buf,

		     __u32 kern_version, char *log_buf,

		     size_t log_buf_sz);



int bpf_map_update_elem(int fd, void *key, void *value,

			u64 flags);

			__u64 flags);



int bpf_map_lookup_elem(int fd, void *key, void *value);

int bpf_map_delete_elem(int fd, void *key);