From 04db7bd740a93405f93bd0f238d71e331e8465a7 Mon Sep 17 00:00:00 2001 From: Jesper Dangaard Brouer Date: Fri, 2 Sep 2022 15:43:29 +0200 Subject: [PATCH] preserve-dscp: Adjust for newer libbpf API MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ‘bpf_map__next’ is deprecated: libbpf v0.7+: use bpf_object__next_map() instead Signed-off-by: Jesper Dangaard Brouer --- Makefile | 1 + preserve-dscp/preserve-dscp.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index aa63913..b20b954 100644 --- a/Makefile +++ b/Makefile @@ -17,6 +17,7 @@ SUBDIRS := encap-forward SUBDIRS += ktrace-CO-RE SUBDIRS += lsm-nobpf SUBDIRS += nat64-bpf +SUBDIRS += preserve-dscp SUBDIRS += traffic-pacing-edt .PHONY: check_submodule help clobber distclean clean $(SUBDIRS) diff --git a/preserve-dscp/preserve-dscp.c b/preserve-dscp/preserve-dscp.c index 9192d12..8c66186 100644 --- a/preserve-dscp/preserve-dscp.c +++ b/preserve-dscp/preserve-dscp.c @@ -84,7 +84,7 @@ int main(int argc, char *argv[]) return err; } - while ((map = bpf_map__next(map, obj))) { + while ((map = bpf_object__next_map(obj, map))) { if (strstr(bpf_map__name(map), ".rodata")) { int ip_only = (iftype == ARPHRD_NONE); bpf_map__set_initial_value(map, &ip_only, sizeof(ip_only));