diff options
author | 2021-10-06 10:58:34 -0700 | |
---|---|---|
committer | 2021-10-06 12:34:03 -0700 | |
commit | 0e545dbaa2797133f57bf8387e8f74cd245cedea (patch) | |
tree | d6b57e0ba51373477c58bea70ec99e43e553913e /tools/bpf/bpftool/prog.c | |
parent | libbpf: Deprecate bpf_object__unload() API since v0.6 (diff) | |
parent | selftests/bpf: Switch to new bpf_object__next_{map,program} APIs (diff) | |
download | linux-dev-0e545dbaa2797133f57bf8387e8f74cd245cedea.tar.xz linux-dev-0e545dbaa2797133f57bf8387e8f74cd245cedea.zip |
Merge branch 'libbpf: Deprecate bpf_{map,program}__{prev,next} APIs since v0.7'
Hengqi Chen says:
====================
bpf_{map,program}__{prev,next} don't follow the libbpf API naming
convention. Deprecate them and replace them with a new set of APIs
named bpf_object__{prev,next}_{program,map}.
v1->v2: [0]
* Addressed Andrii's comments
[0]: https://patchwork.kernel.org/project/netdevbpf/patch/20210906165456.325999-1-hengqi.chen@gmail.com/
====================
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Diffstat (limited to 'tools/bpf/bpftool/prog.c')
-rw-r--r-- | tools/bpf/bpftool/prog.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c index 9c3e343b7d87..a24ea7e26aa4 100644 --- a/tools/bpf/bpftool/prog.c +++ b/tools/bpf/bpftool/prog.c @@ -1601,7 +1601,7 @@ static int load_with_options(int argc, char **argv, bool first_prog_only) goto err_close_obj; if (first_prog_only) { - prog = bpf_program__next(NULL, obj); + prog = bpf_object__next_program(obj, NULL); if (!prog) { p_err("object file doesn't contain any bpf program"); goto err_close_obj; |