From cc15e7a903231f4029ea62317bf08d6ea4cc9d2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= <maze@google.com>
Date: Thu, 31 Jul 2025 16:10:04 -0700
Subject: [PATCH] NetBpfLoad: pinMaps() doesn't need mapNames
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Test: TreeHugger
Flag: EXEMPT mainline/noop
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I87414ecd4acbf83af5b20ddb8c0e540e00ee1f59
---
 bpf/loader/NetBpfLoad.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/bpf/loader/NetBpfLoad.cpp b/bpf/loader/NetBpfLoad.cpp
index 65dbbc70f5..aea0be6e89 100644
--- a/bpf/loader/NetBpfLoad.cpp
+++ b/bpf/loader/NetBpfLoad.cpp
@@ -1326,11 +1326,8 @@ static int prepareLoadProgs(const struct bpf_object* obj, const vector<codeSecti
     return 0;
 }
 
-static int pinMaps(const struct bpf_object* obj,
-                   const vector<struct bpf_map_def>& md, const vector<string>& mapNames) {
-    int ret;
-
-    for (int i = 0; i < (int)mapNames.size(); i++) {
+static int pinMaps(const struct bpf_object* obj, const vector<struct bpf_map_def>& md) {
+    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());
@@ -1344,7 +1341,7 @@ static int pinMaps(const struct bpf_object* obj,
             return -1;
         }
 
-        ret = pinMap(bpf_map__fd(m), md[i]);
+        int ret = pinMap(bpf_map__fd(m), md[i]);
         if (ret) return ret;
     }
     return 0;
@@ -1416,7 +1413,7 @@ static int loadProgByLibbpf(const char* const elfPath, const unsigned int bpfloa
     ret = bpf_object__load(obj);
     if (ret) return ret;
 
-    ret = pinMaps(obj, md, mapNames);
+    ret = pinMaps(obj, md);
     if (ret) return ret;
 
     ret = pinProgs(obj, cs, bpfloader_ver);