lkml.org 
[lkml]   [2018]   [Jun]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 11/19] tools include uapi: Synchronize bpf.h with the kernel
    Date
    From: Arnaldo Carvalho de Melo <acme@redhat.com>

    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>
    ---
    tools/include/uapi/linux/bpf.h | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    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;
    --
    2.14.3
    \
     
     \ /
      Last update: 2018-06-25 19:44    [W:2.386 / U:0.308 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site