From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stanislav Fomichev Subject: [PATCH bpf-next v3 3/3] bpf: libbpf: don't specify prog name if kernel doesn't support it Date: Tue, 20 Nov 2018 17:11:21 -0800 Message-ID: <20181121011121.159355-3-sdf@google.com> References: <20181121011121.159355-1-sdf@google.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Cc: Stanislav Fomichev To: netdev@vger.kernel.org, ast@kernel.org, daniel@iogearbox.net Return-path: Received: from mail-qt1-f202.google.com ([209.85.160.202]:51586 "EHLO mail-qt1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726467AbeKULnv (ORCPT ); Wed, 21 Nov 2018 06:43:51 -0500 Received: by mail-qt1-f202.google.com with SMTP id n39so1914017qtn.18 for ; Tue, 20 Nov 2018 17:11:46 -0800 (PST) In-Reply-To: <20181121011121.159355-1-sdf@google.com> Sender: netdev-owner@vger.kernel.org List-ID: Use recently added capability check. See commit 23499442c319 ("bpf: libbpf: retry map creation without the name") for rationale. Signed-off-by: Stanislav Fomichev --- tools/lib/bpf/libbpf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index bf45f285d0a0..a080aeff7e2e 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -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; -- 2.19.1.1215.g8438c0b245-goog