Merge branch 'bpf-bpftool-various-fixes'

Browse source

Jakub Kicinski says:

====================
Two small fixes here to listing maps and programs.  The loop for showing
maps is written slightly differently to programs which was missed in JSON
output support, and output would be broken if any of the system calls
failed.  Second fix is in very unlikely case that program or map disappears
after we get its ID we should just skip over that object instead of failing.
====================

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

...

This commit is contained in:

Daniel Borkmann 2017-12-23 01:09:53 +01:00

parent cd95a89282 8207c6dd47

commit aee657460a

2 changed files with 7 additions and 3 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

8

tools/bpf/bpftool/map.c

View file

2

tools/bpf/bpftool/prog.c

View file