bpf: libbpf: don't specify prog name if kernel doesn't support it
authorStanislav Fomichev <sdf@google.com>
Wed, 21 Nov 2018 01:11:21 +0000 (17:11 -0800)
committerDaniel Borkmann <daniel@iogearbox.net>
Wed, 21 Nov 2018 22:26:14 +0000 (23:26 +0100)
Use recently added capability check.

See commit 23499442c319 ("bpf: libbpf: retry map creation without
the name") for rationale.

Signed-off-by: Stanislav Fomichev <sdf@google.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
tools/lib/bpf/libbpf.c

index f28e64d..edbae2b 100644 (file)
@@ -1439,7 +1439,8 @@ load_program(struct bpf_program *prog, struct bpf_insn *insns, int insns_cnt,
        memset(&load_attr, 0, sizeof(struct bpf_load_program_attr));
        load_attr.prog_type = prog->type;
        load_attr.expected_attach_type = prog->expected_attach_type;
-       load_attr.name = prog->name;
+       if (prog->caps->name)
+               load_attr.name = prog->name;
        load_attr.insns = insns;
        load_attr.insns_cnt = insns_cnt;
        load_attr.license = license;