Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

[linux.git] / tools / lib / bpf / bpf.c

diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c
index c7d7993c44bb0e1b6f7cdef1dc747050fdd0dbe9..cbb933532981f0923b2d37ac3acacf1d5e428b46 100644 (file)
--- a/tools/lib/bpf/bpf.c
+++ b/tools/lib/bpf/bpf.c
@@ -568,7 +568,7 @@ int bpf_prog_test_run_xattr(struct bpf_prog_test_run_attr *test_attr)
        return ret;
 }
 
-int bpf_prog_get_next_id(__u32 start_id, __u32 *next_id)
+static int bpf_obj_get_next_id(__u32 start_id, __u32 *next_id, int cmd)
 {
        union bpf_attr attr;
        int err;
@@ -576,26 +576,26 @@ int bpf_prog_get_next_id(__u32 start_id, __u32 *next_id)
        memset(&attr, 0, sizeof(attr));
        attr.start_id = start_id;
 
-       err = sys_bpf(BPF_PROG_GET_NEXT_ID, &attr, sizeof(attr));
+       err = sys_bpf(cmd, &attr, sizeof(attr));
        if (!err)
                *next_id = attr.next_id;
 
        return err;
 }
 
-int bpf_map_get_next_id(__u32 start_id, __u32 *next_id)
+int bpf_prog_get_next_id(__u32 start_id, __u32 *next_id)
 {
-       union bpf_attr attr;
-       int err;
-
-       memset(&attr, 0, sizeof(attr));
-       attr.start_id = start_id;
+       return bpf_obj_get_next_id(start_id, next_id, BPF_PROG_GET_NEXT_ID);
+}
 
-       err = sys_bpf(BPF_MAP_GET_NEXT_ID, &attr, sizeof(attr));
-       if (!err)
-               *next_id = attr.next_id;
+int bpf_map_get_next_id(__u32 start_id, __u32 *next_id)
+{
+       return bpf_obj_get_next_id(start_id, next_id, BPF_MAP_GET_NEXT_ID);
+}
 
-       return err;
+int bpf_btf_get_next_id(__u32 start_id, __u32 *next_id)
+{
+       return bpf_obj_get_next_id(start_id, next_id, BPF_BTF_GET_NEXT_ID);
 }
 
 int bpf_prog_get_fd_by_id(__u32 id)