OSDN Git Service

tools headers uapi: Update linux/in.h copy
authorArnaldo Carvalho de Melo <acme@redhat.com>
Thu, 19 Mar 2020 14:42:56 +0000 (11:42 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Thu, 19 Mar 2020 15:31:49 +0000 (12:31 -0300)
commit564200ed8e71d91327d337e46bc778cee02da866
treec1cf5a3dfea50d3634b05d5108841f10ffc86fe4
parentdb5d85ce82487331b06ec0e076b85b5a3968bf53
tools headers uapi: Update linux/in.h copy

To get the changes in:

  267762538705 ("seg6: fix SRv6 L2 tunnels to use IANA-assigned protocol number")

That ends up automatically adding the new IPPROTO_ETHERNET to the socket
args beautifiers:

  $ tools/perf/trace/beauty/socket_ipproto.sh > before

Apply this patch:

  $ tools/perf/trace/beauty/socket_ipproto.sh > after
  $ diff -u before after
  --- before 2020-03-19 11:48:36.876673819 -0300
  +++ after 2020-03-19 11:49:00.148541377 -0300
  @@ -6,6 +6,7 @@
    [132] = "SCTP",
    [136] = "UDPLITE",
    [137] = "MPLS",
  + [143] = "ETHERNET",
    [17] = "UDP",
    [1] = "ICMP",
    [22] = "IDP",
  $

Addresses this tools/perf build warning:

  Warning: Kernel ABI header at 'tools/include/uapi/linux/in.h' differs from latest version at 'include/uapi/linux/in.h'
  diff -u tools/include/uapi/linux/in.h include/uapi/linux/in.h

Cc: David S. Miller <davem@davemloft.net>
Cc: Paolo Lungaroni <paolo.lungaroni@cnit.it>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/include/uapi/linux/in.h