diff options
| author |   Alexei Starovoitov <ast@kernel.org> | 2018-12-05 18:48:41 -0800 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2018-12-05 18:48:41 -0800 |
| commit | a06aef4ed5b6f1daa20babb4ad4458392bce5edd (patch) | |
| tree | d1b34c120c66dd799428ca4e61bf8ed710f4ae3e /tools/include/uapi/linux | |
| parent | tools: bpftool: add a command to dump the trace pipe (diff) | |
| parent | bpf: Expect !info.func_info and insn_off name changes in test_btf/libbpf/bpftool (diff) | |
Merge branch 'bpf_func_info-improvements'
Martin KaFai Lau says:
====================
The patchset has a few improvements on bpf_func_info:
1. Improvements on the behaviors of info.func_info, info.func_info_cnt
and info.func_info_rec_size.
2. Name change: s/insn_offset/insn_off/
Please see individual patch for details.
====================
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'tools/include/uapi/linux')
| -rw-r--r-- | tools/include/uapi/linux/bpf.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index 64262890feb2..16263e8827fc 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -2991,7 +2991,7 @@ struct bpf_flow_keys { }; struct bpf_func_info { - __u32 insn_offset; + __u32 insn_off; __u32 type_id; }; |