From 3f44c16a153eb4c81a0f70b1cd832fd60a2475d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Thu, 31 Jul 2025 16:17:36 -0700 Subject: [PATCH] NetBpfLoad: prepareLoadMaps() doesn't need mapNames MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Test: TreeHugger Flag: EXEMPT mainline Signed-off-by: Maciej Żenczykowski Change-Id: I0a8f73fc8104dbe1af44395993b634c18fc3b595 --- bpf/loader/NetBpfLoad.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bpf/loader/NetBpfLoad.cpp b/bpf/loader/NetBpfLoad.cpp index aea0be6e89..b2aea48e70 100644 --- a/bpf/loader/NetBpfLoad.cpp +++ b/bpf/loader/NetBpfLoad.cpp @@ -1242,10 +1242,10 @@ static int loadCodeSections(const char* elfPath, vector& cs, const } static int prepareLoadMaps(const struct bpf_object* obj, const vector& md, - const vector& mapNames, const unsigned int bpfloader_ver) { + const unsigned int bpfloader_ver) { unsigned kvers = kernelVersion(); - for (int i = 0; i < (int)mapNames.size(); i++) { + for (unsigned i = 0; i < md.size(); i++) { struct bpf_map* m = bpf_object__find_map_by_name(obj, md[i].name()); if (!m) { ALOGE("bpf_object does not contain map: %s", md[i].name()); @@ -1401,7 +1401,7 @@ static int loadProgByLibbpf(const char* const elfPath, const unsigned int bpfloa ret = readMapNames(elfFile, mapNames); if (ret) return ret; - ret = prepareLoadMaps(obj, md, mapNames, bpfloader_ver); + ret = prepareLoadMaps(obj, md, bpfloader_ver); if (ret) return ret; ret = readCodeSections(elfFile, cs);