lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Sat, 04 Apr 2020 08:41:58 -0000 From: "tip-bot2 for Arnaldo Carvalho de Melo" <tip-bot2@...utronix.de> To: linux-tip-commits@...r.kernel.org Cc: "David S. Miller" <davem@...emloft.net>, Paolo Lungaroni <paolo.lungaroni@...t.it>, Adrian Hunter <adrian.hunter@...el.com>, Jiri Olsa <jolsa@...nel.org>, Namhyung Kim <namhyung@...nel.org>, Arnaldo Carvalho de Melo <acme@...hat.com>, x86 <x86@...nel.org>, LKML <linux-kernel@...r.kernel.org> Subject: [tip: perf/urgent] tools headers uapi: Update linux/in.h copy The following commit has been merged into the perf/urgent branch of tip: Commit-ID: 29f36c168813f1beaf59812cc79ef46fb33c669a Gitweb: https://git.kernel.org/tip/29f36c168813f1beaf59812cc79ef46fb33c669a Author: Arnaldo Carvalho de Melo <acme@...hat.com> AuthorDate: Thu, 19 Mar 2020 11:42:56 -03:00 Committer: Arnaldo Carvalho de Melo <acme@...hat.com> CommitterDate: Tue, 24 Mar 2020 10:35:58 -03:00 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@...emloft.net> Cc: Paolo Lungaroni <paolo.lungaroni@...t.it> Cc: Adrian Hunter <adrian.hunter@...el.com> Cc: Jiri Olsa <jolsa@...nel.org> Cc: Namhyung Kim <namhyung@...nel.org> Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com> --- tools/include/uapi/linux/in.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/include/uapi/linux/in.h b/tools/include/uapi/linux/in.h index 1521073..8533bf0 100644 --- a/tools/include/uapi/linux/in.h +++ b/tools/include/uapi/linux/in.h @@ -74,6 +74,8 @@ enum { #define IPPROTO_UDPLITE IPPROTO_UDPLITE IPPROTO_MPLS = 137, /* MPLS in IP (RFC 4023) */ #define IPPROTO_MPLS IPPROTO_MPLS + IPPROTO_ETHERNET = 143, /* Ethernet-within-IPv6 Encapsulation */ +#define IPPROTO_ETHERNET IPPROTO_ETHERNET IPPROTO_RAW = 255, /* Raw IP packets */ #define IPPROTO_RAW IPPROTO_RAW IPPROTO_MPTCP = 262, /* Multipath TCP connection */
Powered by blists - more mailing lists