| commit | bba9e006b12403294066ba33353b27dbe9679d23 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Tue Apr 23 01:02:39 2024 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Apr 23 01:02:39 2024 +0000 |
| tree | f47b92cd65df3cfa9976246ca2e8d4c7623f2786 | |
| parent | 522d5c7e7a527125c4c1d462f62242f9617483d5 [diff] | |
| parent | d0bb172371c7df041b366010d3682f1bf458a7e3 [diff] |
Merge "NetBpfLoad: map names are only valid on 4.15+" into main
diff --git a/netbpfload/loader.cpp b/netbpfload/loader.cpp index a2fa4b8..f5e45d6 100644 --- a/netbpfload/loader.cpp +++ b/netbpfload/loader.cpp
@@ -769,7 +769,7 @@ .max_entries = max_entries, .map_flags = md[i].map_flags, }; - if (isAtLeastKernelVersion(4, 14, 0)) + if (isAtLeastKernelVersion(4, 15, 0)) strlcpy(req.map_name, mapNames[i].c_str(), sizeof(req.map_name)); fd.reset(bpf(BPF_MAP_CREATE, req)); saved_errno = errno;