summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuentin Monnet <quentin.monnet@netronome.com>2019-04-12 15:29:34 +0200
committerDaniel Borkmann <daniel@iogearbox.net>2019-04-16 10:13:12 +0200
commit031ebc1aac3dc26c5ef9f5236ad35366bd57de61 (patch)
tree8e82483f6e320d71cb4df795b4cfc09ed4fcbe4f
parentbpf: reserve flags in bpf_skb_net_shrink (diff)
downloadlinux-031ebc1aac3dc26c5ef9f5236ad35366bd57de61.tar.xz
linux-031ebc1aac3dc26c5ef9f5236ad35366bd57de61.zip
tools: bpftool: remove blank line after btf_id when listing programs
Commit 569b0c77735d ("tools/bpftool: show btf id in program information") made bpftool print an empty line after each program entry when listing the BPF programs loaded on the system (plain output). This is especially confusing when some programs have an associated BTF id, and others don't. Let's remove the blank line. Signed-off-by: Quentin Monnet <quentin.monnet@netronome.com> Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com> Acked-by: Song Liu <songliubraving@fb.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
-rw-r--r--tools/bpf/bpftool/prog.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c
index 81067803189e..4b7a307b9fc9 100644
--- a/tools/bpf/bpftool/prog.c
+++ b/tools/bpf/bpftool/prog.c
@@ -323,7 +323,7 @@ static void print_prog_plain(struct bpf_prog_info *info, int fd)
}
if (info->btf_id)
- printf("\n\tbtf_id %d\n", info->btf_id);
+ printf("\n\tbtf_id %d", info->btf_id);
printf("\n");
}