tools lib bpf: use __u32 from linux/types.h
authorJoe Stringer <joe@ovn.org>
Fri, 9 Dec 2016 02:46:15 +0000 (18:46 -0800)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Thu, 15 Dec 2016 19:25:46 +0000 (16:25 -0300)
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: Joe Stringer <joe@ovn.org>
Acked-by: Wang 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: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/lib/bpf/bpf.c
tools/lib/bpf/bpf.h

index 8143536b462a54a9d633e455615085b8a842aa01..89e8e8e5b60e4b80aa8ff6c36e99691c3c272695 100644 (file)
@@ -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;
 
index 253c3dbb06b420a39558512f89b80ce81a719287..61130170a6ad27471294823cc0257897e686ac69 100644 (file)
@@ -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);