diff options
author | Mickaël Salaün <mic@digikod.net> | 2017-02-09 18:21:38 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-02-10 15:56:06 -0500 |
commit | 2ee89fb9a942e250b5adb5535de4acca14bb7fa2 (patch) | |
tree | a2a05ae382318bb1a863aa8afee37055409e521c /tools/lib | |
parent | d02d8986a7688d3f0ff6ef61aa6beb41427692eb (diff) |
bpf: Use bpf_load_program() from the library
Replace bpf_prog_load() with bpf_load_program() calls.
Signed-off-by: Mickaël Salaün <mic@digikod.net>
Cc: Alexei Starovoitov <ast@fb.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Shuah Khan <shuah@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/lib')
-rw-r--r-- | tools/lib/bpf/bpf.c | 6 | ||||
-rw-r--r-- | tools/lib/bpf/bpf.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c index 3ddb58a36d3c..58ce252073fa 100644 --- a/tools/lib/bpf/bpf.c +++ b/tools/lib/bpf/bpf.c | |||
@@ -42,7 +42,7 @@ | |||
42 | # endif | 42 | # endif |
43 | #endif | 43 | #endif |
44 | 44 | ||
45 | static __u64 ptr_to_u64(void *ptr) | 45 | static __u64 ptr_to_u64(const void *ptr) |
46 | { | 46 | { |
47 | return (__u64) (unsigned long) ptr; | 47 | return (__u64) (unsigned long) ptr; |
48 | } | 48 | } |
@@ -69,8 +69,8 @@ int bpf_create_map(enum bpf_map_type map_type, int key_size, | |||
69 | return sys_bpf(BPF_MAP_CREATE, &attr, sizeof(attr)); | 69 | return sys_bpf(BPF_MAP_CREATE, &attr, sizeof(attr)); |
70 | } | 70 | } |
71 | 71 | ||
72 | int bpf_load_program(enum bpf_prog_type type, struct bpf_insn *insns, | 72 | int bpf_load_program(enum bpf_prog_type type, const struct bpf_insn *insns, |
73 | size_t insns_cnt, char *license, | 73 | size_t insns_cnt, const char *license, |
74 | __u32 kern_version, char *log_buf, size_t log_buf_sz) | 74 | __u32 kern_version, char *log_buf, size_t log_buf_sz) |
75 | { | 75 | { |
76 | int fd; | 76 | int fd; |
diff --git a/tools/lib/bpf/bpf.h b/tools/lib/bpf/bpf.h index a2f9853dd882..bc959a2de023 100644 --- a/tools/lib/bpf/bpf.h +++ b/tools/lib/bpf/bpf.h | |||
@@ -28,8 +28,8 @@ int bpf_create_map(enum bpf_map_type map_type, int key_size, int value_size, | |||
28 | 28 | ||
29 | /* Recommend log buffer size */ | 29 | /* Recommend log buffer size */ |
30 | #define BPF_LOG_BUF_SIZE 65536 | 30 | #define BPF_LOG_BUF_SIZE 65536 |
31 | int bpf_load_program(enum bpf_prog_type type, struct bpf_insn *insns, | 31 | int bpf_load_program(enum bpf_prog_type type, const struct bpf_insn *insns, |
32 | size_t insns_cnt, char *license, | 32 | size_t insns_cnt, const char *license, |
33 | __u32 kern_version, char *log_buf, | 33 | __u32 kern_version, char *log_buf, |
34 | size_t log_buf_sz); | 34 | size_t log_buf_sz); |
35 | 35 | ||