bpf-compat: drop unused compat_libbpf_probe_bpf_prog_type()

diff --git a/src/shared/bpf-compat.h b/src/shared/bpf-compat.h
index 27857e9d72eaa7f307105d6805de27a91c91485c..7c2c6a2db22ca3e2bfc8ed91d7297b4da3b46876 100644 (file)
--- a/src/shared/bpf-compat.h
+++ b/src/shared/bpf-compat.h
@@ -26,12 +26,10 @@ struct bpf_map_create_opts;
  *  - before the compat static inline helpers that use them.
  * When removing this file move these back to bpf-dlopen.h */
 extern int (*sym_bpf_map_create)(enum bpf_map_type,  const char *, __u32, __u32, __u32, const struct bpf_map_create_opts *);
-extern int (*sym_libbpf_probe_bpf_prog_type)(enum bpf_prog_type, const void *);
 extern struct bpf_map* (*sym_bpf_object__next_map)(const struct bpf_object *obj, const struct bpf_map *map);
 
 /* compat symbols removed in libbpf 1.0 */
 extern int (*sym_bpf_create_map)(enum bpf_map_type, int key_size, int value_size, int max_entries, __u32 map_flags);
-extern bool (*sym_bpf_probe_prog_type)(enum bpf_prog_type, __u32);
 
 /* helpers to use the available variant behind new API */
 static inline int compat_bpf_map_create(enum bpf_map_type map_type,
@@ -47,10 +45,3 @@ static inline int compat_bpf_map_create(enum bpf_map_type map_type,
         return sym_bpf_create_map(map_type, key_size, value_size, max_entries,
                                   0 /* opts->map_flags, but opts is always NULL for us so skip build dependency on the type */);
 }
-
-static inline int compat_libbpf_probe_bpf_prog_type(enum bpf_prog_type prog_type, const void *opts) {
-        if (sym_libbpf_probe_bpf_prog_type)
-                return sym_libbpf_probe_bpf_prog_type(prog_type, opts);
-
-        return sym_bpf_probe_prog_type(prog_type, 0);
-}

diff --git a/src/shared/bpf-dlopen.c b/src/shared/bpf-dlopen.c
index debde5c734db37f08f71d1bbc58faebc6ec24ea8..5a3b0b6cb3c04659272325a9c3089d6b6347a7bc 100644 (file)
--- a/src/shared/bpf-dlopen.c
+++ b/src/shared/bpf-dlopen.c
@@ -51,12 +51,10 @@ DLSYM_PROTOTYPE(ring_buffer__poll) = NULL;
 
 /* new symbols available from libbpf 0.7.0 */
 int (*sym_bpf_map_create)(enum bpf_map_type,  const char *, __u32, __u32, __u32, const struct bpf_map_create_opts *);
-int (*sym_libbpf_probe_bpf_prog_type)(enum bpf_prog_type, const void *);
 struct bpf_map* (*sym_bpf_object__next_map)(const struct bpf_object *obj, const struct bpf_map *map);
 
 /* compat symbols removed in libbpf 1.0 */
 int (*sym_bpf_create_map)(enum bpf_map_type,  int key_size, int value_size, int max_entries, __u32 map_flags);
-bool (*sym_bpf_probe_prog_type)(enum bpf_prog_type, __u32);
 
 _printf_(2,0)
 static int bpf_print_func(enum libbpf_print_level level, const char *fmt, va_list ap) {
@@ -106,11 +104,9 @@ int dlopen_bpf_full(int log_level) {
                                 dl, LOG_DEBUG,
 #if MODERN_LIBBPF
                                 /* Don't exist anymore in new libbpf, hence cannot type check them */
-                                DLSYM_ARG_FORCE(bpf_create_map),
-                                DLSYM_ARG_FORCE(bpf_probe_prog_type)
+                                DLSYM_ARG_FORCE(bpf_create_map)
 #else
-                                DLSYM_ARG(bpf_create_map),
-                                DLSYM_ARG(bpf_probe_prog_type)
+                                DLSYM_ARG(bpf_create_map)
 #endif
                 );
 
@@ -123,12 +119,10 @@ int dlopen_bpf_full(int log_level) {
                                 dl, LOG_DEBUG,
 #if MODERN_LIBBPF
                                 DLSYM_ARG(bpf_map_create),
-                                DLSYM_ARG(libbpf_probe_bpf_prog_type),
                                 DLSYM_ARG(bpf_object__next_map)
 #else
                                 /* These symbols did not exist in old libbpf, hence we cannot type check them */
                                 DLSYM_ARG_FORCE(bpf_map_create),
-                                DLSYM_ARG_FORCE(libbpf_probe_bpf_prog_type),
                                 DLSYM_ARG_FORCE(bpf_object__next_map)
 #endif
                 );