diff options
| author | Daniel Borkmann | 2018-05-23 12:03:33 +0200 |
|---|---|---|
| committer | Daniel Borkmann | 2018-05-23 12:03:34 +0200 |
| commit | ff4fb475cea8580eb0490d0a5d55ee02d95d26e1 (patch) | |
| tree | 10cf3d584e25f564d0cbc3653eb428dd21962f1d /tools/lib/bpf/bpf.c | |
| parent | Merge branch 'bpf-fib-mtu-check' (diff) | |
| parent | bpf: btf: Add tests for the btf uapi changes (diff) | |
| download | kernel-qcow2-linux-ff4fb475cea8580eb0490d0a5d55ee02d95d26e1.tar.gz kernel-qcow2-linux-ff4fb475cea8580eb0490d0a5d55ee02d95d26e1.tar.xz kernel-qcow2-linux-ff4fb475cea8580eb0490d0a5d55ee02d95d26e1.zip | |
Merge branch 'btf-uapi-cleanups'
Martin KaFai Lau says:
====================
This patch set makes some changes to cleanup the unused
bits in BTF uapi. It also makes the btf_header extensible.
Please see individual patches for details.
v2:
- Remove NR_SECS from patch 2
- Remove "unsigned" check on array->index_type from patch 3
- Remove BTF_INT_VARARGS and further limit BTF_INT_ENCODING
from 8 bits to 4 bits in patch 4
- Adjustments in test_btf.c to reflect changes in v2
====================
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Diffstat (limited to 'tools/lib/bpf/bpf.c')
| -rw-r--r-- | tools/lib/bpf/bpf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c index 6a8a00097fd8..442b4cdfeb71 100644 --- a/tools/lib/bpf/bpf.c +++ b/tools/lib/bpf/bpf.c @@ -89,8 +89,8 @@ int bpf_create_map_xattr(const struct bpf_create_map_attr *create_attr) min(name_len, BPF_OBJ_NAME_LEN - 1)); attr.numa_node = create_attr->numa_node; attr.btf_fd = create_attr->btf_fd; - attr.btf_key_id = create_attr->btf_key_id; - attr.btf_value_id = create_attr->btf_value_id; + attr.btf_key_type_id = create_attr->btf_key_type_id; + attr.btf_value_type_id = create_attr->btf_value_type_id; attr.map_ifindex = create_attr->map_ifindex; return sys_bpf(BPF_MAP_CREATE, &attr, sizeof(attr)); |