diff options
| author | Arnaldo Carvalho de Melo | 2018-06-15 21:55:32 +0200 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo | 2018-06-25 16:59:36 +0200 |
| commit | f568b472815fd6c34fe4cc30dde4572ee300d6c4 (patch) | |
| tree | 059ef8f30e44d74503ed5fb07a02f8fe50676555 /tools/include/uapi/linux/bpf.h | |
| parent | tools include uapi: Update if_link.h to pick IFLA_{BRPORT_ISOLATED,VXLAN_TTL_... (diff) | |
| download | kernel-qcow2-linux-f568b472815fd6c34fe4cc30dde4572ee300d6c4.tar.gz kernel-qcow2-linux-f568b472815fd6c34fe4cc30dde4572ee300d6c4.tar.xz kernel-qcow2-linux-f568b472815fd6c34fe4cc30dde4572ee300d6c4.zip | |
tools include uapi: Synchronize bpf.h with the kernel
To pick the rename in:
bd3a08aaa9a3 ("bpf: flowlabel in bpf_fib_lookup should be flowinfo")
Silencing this build warning:
Warning: Kernel ABI header at 'tools/include/uapi/linux/bpf.h' differs from latest version at 'include/uapi/linux/bpf.h'
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/n/tip-zd1sgtbybtjrrt7bqdybu0s0@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/include/uapi/linux/bpf.h')
| -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 e0b06784f227..59b19b6a40d7 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -2630,7 +2630,7 @@ struct bpf_fib_lookup { union { /* inputs to lookup */ __u8 tos; /* AF_INET */ - __be32 flowlabel; /* AF_INET6 */ + __be32 flowinfo; /* AF_INET6, flow_label + priority */ /* output: metric of fib result (IPv4/IPv6 only) */ __u32 rt_metric; |