tools: libbpf: add a correctly named define for map iteration

For historical reasons the helper to loop over maps in an object
is called bpf_map__for_each while it really should be called
bpf_object__for_each_map.  Rename and add a correctly named
define for backward compatibility.

Switch all in-tree users to the correct name (Quentin).

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Quentin Monnet <quentin.monnet@netronome.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

1 files changed, 2 insertions, 2 deletions

diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c
index 0c35dd543d49..8ef80d65a474 100644
--- a/tools/bpf/bpftool/prog.c
+++ b/tools/bpf/bpftool/prog.c
@@ -1053,7 +1053,7 @@ static int load_with_options(int argc, char **argv, bool first_prog_only)
         j = 0;
         while (j < old_map_fds && map_replace[j].name) {
                 i = 0;
-                bpf_map__for_each(map, obj) {
+                bpf_object__for_each_map(map, obj) {
                         if (!strcmp(bpf_map__name(map), map_replace[j].name)) {
                                 map_replace[j].idx = i;
                                 break;
@@ -1074,7 +1074,7 @@ static int load_with_options(int argc, char **argv, bool first_prog_only)
         /* Set ifindex and name reuse */
         j = 0;
         idx = 0;
-        bpf_map__for_each(map, obj) {
+        bpf_object__for_each_map(map, obj) {
                 if (!bpf_map__is_offload_neutral(map))
                         bpf_map__set_ifindex(map, ifindex);