Skip to content

Commit 564200e

Browse files
committed
tools headers uapi: Update linux/in.h copy
To get the changes in: 2677625 ("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 <[email protected]> Cc: Paolo Lungaroni <[email protected]> Cc: Adrian Hunter <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Namhyung Kim <[email protected]> Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent db5d85c commit 564200e

File tree

1 file changed

+2
-0
lines changed
  • tools/include/uapi/linux

1 file changed

+2
-0
lines changed

tools/include/uapi/linux/in.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ enum {
7474
#define IPPROTO_UDPLITE IPPROTO_UDPLITE
7575
IPPROTO_MPLS = 137, /* MPLS in IP (RFC 4023) */
7676
#define IPPROTO_MPLS IPPROTO_MPLS
77+
IPPROTO_ETHERNET = 143, /* Ethernet-within-IPv6 Encapsulation */
78+
#define IPPROTO_ETHERNET IPPROTO_ETHERNET
7779
IPPROTO_RAW = 255, /* Raw IP packets */
7880
#define IPPROTO_RAW IPPROTO_RAW
7981
IPPROTO_MPTCP = 262, /* Multipath TCP connection */

0 commit comments

Comments
 (0)