diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-01-02 17:10:07 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-01-02 17:10:07 +0300 |
commit | 69c444ba93b76f2da4f23449c72e83521142b243 (patch) | |
tree | 4d460a117b909ed5d38cf01e00b95f01b4bbb68c /tools/bpf/bpftool/prog.c | |
parent | 2b022ab7542df60021ab57854b3faaaf42552eaf (diff) | |
parent | 30a7acd573899fd8b8ac39236eff6468b195ac7d (diff) | |
download | linux-69c444ba93b76f2da4f23449c72e83521142b243.tar.xz |
Merge 4.15-rc6 into tty-next
We want the ldisc fix here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/bpf/bpftool/prog.c')
-rw-r--r-- | tools/bpf/bpftool/prog.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c index ad619b96c276..dded77345bfb 100644 --- a/tools/bpf/bpftool/prog.c +++ b/tools/bpf/bpftool/prog.c @@ -382,6 +382,8 @@ static int do_show(int argc, char **argv) fd = bpf_prog_get_fd_by_id(id); if (fd < 0) { + if (errno == ENOENT) + continue; p_err("can't get prog by id (%u): %s", id, strerror(errno)); err = -1; |