From 17bf51b74ddd4696ad3393ff700eb5dca3a617f0 Mon Sep 17 00:00:00 2001 From: David Ahern Date: Sat, 23 Apr 2022 09:23:00 -0600 Subject: [PATCH] libbpf: Remove use of bpf_map_is_offload_neutral MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit bpf_map_is_offload_neutral is deprecated as of v0.8+; import definition to maintain backwards compatibility. Signed-off-by: David Ahern Acked-by: Toke Høiland-Jørgensen Signed-off-by: Stephen Hemminger --- lib/bpf_libbpf.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/bpf_libbpf.c b/lib/bpf_libbpf.c index 7dd1faf53..7b16ee715 100644 --- a/lib/bpf_libbpf.c +++ b/lib/bpf_libbpf.c @@ -249,6 +249,11 @@ static int handle_legacy_maps(struct bpf_object *obj) return ret; } +static bool bpf_map_is_offload_neutral(const struct bpf_map *map) +{ + return bpf_map__type(map) == BPF_MAP_TYPE_PERF_EVENT_ARRAY; +} + static int load_bpf_object(struct bpf_cfg_in *cfg) { struct bpf_program *p, *prog = NULL; @@ -294,7 +299,7 @@ static int load_bpf_object(struct bpf_cfg_in *cfg) } bpf_object__for_each_map(map, obj) { - if (!bpf_map__is_offload_neutral(map)) + if (!bpf_map_is_offload_neutral(map)) bpf_map__set_ifindex(map, cfg->ifindex); } -- 2.47.2