commit d6aa6218e36196a483280b6c906da356a4948624
author Maciej Żenczykowski <maze@google.com> Wed Jan 04 10:28:51 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 04 10:28:51 2023 +0000
tree 481dcc19f1027891870422a37bfff6528d484088
parent 17686b4c0527b6f7a3ce08de55c78e54882d7be7
parent ff998720b64f219e97ce95d8575713c871ff0853

Merge "Use the .o-wide bpfloader min/max ver for maps & programs too"

staticlibs/native/bpf_headers/include/bpf/bpf_helpers.h

diff --git a/staticlibs/native/bpf_headers/include/bpf/bpf_helpers.h b/staticlibs/native/bpf_headers/include/bpf/bpf_helpers.h
index 4d48720..5b17a8e 100644
--- a/staticlibs/native/bpf_headers/include/bpf/bpf_helpers.h
+++ b/staticlibs/native/bpf_headers/include/bpf/bpf_helpers.h
@@ -167,8 +167,8 @@
       .uid = (usr),                                                         \
       .gid = (grp),                                                         \
       .mode = (md),                                                         \
-      .bpfloader_min_ver = DEFAULT_BPFLOADER_MIN_VER,                       \
-      .bpfloader_max_ver = DEFAULT_BPFLOADER_MAX_VER,                       \
+      .bpfloader_min_ver = BPFLOADER_MIN_VER,                               \
+      .bpfloader_max_ver = BPFLOADER_MAX_VER,                               \
       .min_kver = (minkver),                                                \
       .max_kver = (maxkver),                                                \
       .selinux_context = (selinux),                                         \
@@ -296,8 +296,8 @@
             .min_kver = (min_kv),                                                                  \
             .max_kver = (max_kv),                                                                  \
             .optional = (opt),                                                                     \
-            .bpfloader_min_ver = DEFAULT_BPFLOADER_MIN_VER,                                        \
-            .bpfloader_max_ver = DEFAULT_BPFLOADER_MAX_VER,                                        \
+            .bpfloader_min_ver = BPFLOADER_MIN_VER,                                                \
+            .bpfloader_max_ver = BPFLOADER_MAX_VER,                                                \
             .selinux_context = selinux,                                                            \
             .pin_subdir = pindir,                                                                  \
     };                                                                                             \