tools headers: Fixup tools/include/uapi/linux/bpf.h copy of kernel ABI header
authorArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 31 Jul 2017 13:45:07 +0000 (10:45 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 31 Jul 2017 13:45:07 +0000 (10:45 -0300)
commitd62c1d7213b77eb4952a873ad57727e991ac3306
tree5a9e758cc2d06297a85cb4a9a6c2015a24bfb648
parenta40f61777b8c66cfd61c37b0102387578abb8ed0
tools headers: Fixup tools/include/uapi/linux/bpf.h copy of kernel ABI header

In 2be7e212d541 ("bpf: add bpf_skb_adjust_room helper") BPF_ADJ_ROOM_NET was
added to include/uapi/linux/bpf.h but BPF_ADJ_ROOM_NET_OPS was added to
tools/include/uapi/linux/bpf.h, making these files differ, fix it by using the
same name in both, BPF_ADJ_ROOM_NET, the one in the kernel headers copy.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: David Ahern <dsahern@gmail.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Fixes: 2be7e212d541 ("bpf: add bpf_skb_adjust_room helper")
Link: http://lkml.kernel.org/n/tip-2bmwovi9lymplyz6wsszppyf@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/include/uapi/linux/bpf.h