From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2101) id 300DD3938C32; Sun, 26 Apr 2020 02:26:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 300DD3938C32 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Alistair Francis To: glibc-cvs@sourceware.org Subject: [glibc/alistair/rv32.next] Revert "Add IPPROTO_ETHERNET and IPPROTO_MPTCP from Linux 5.6 to netinet/in.h." X-Act-Checkin: glibc X-Git-Author: Alistair Francis X-Git-Refname: refs/heads/alistair/rv32.next X-Git-Oldrev: 858342bd91eb1fa9dec42f1fdfb9973d1e2845cc X-Git-Newrev: 5b738d3df30be3eb7dda1eb99edb02ce974f1031 Message-Id: <20200426022649.300DD3938C32@sourceware.org> Date: Sun, 26 Apr 2020 02:26:49 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Apr 2020 02:26:49 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=5b738d3df30be3eb7dda1eb99edb02ce974f1031 commit 5b738d3df30be3eb7dda1eb99edb02ce974f1031 Author: Alistair Francis Date: Wed Apr 8 14:43:47 2020 -0700 Revert "Add IPPROTO_ETHERNET and IPPROTO_MPTCP from Linux 5.6 to netinet/in.h." This reverts commit f9ac84f92f151e07586c55e14ed628d493a5929d. Diff: --- inet/netinet/in.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/inet/netinet/in.h b/inet/netinet/in.h index f6355c7efe..95eaf68dfe 100644 --- a/inet/netinet/in.h +++ b/inet/netinet/in.h @@ -87,12 +87,8 @@ enum #define IPPROTO_UDPLITE IPPROTO_UDPLITE IPPROTO_MPLS = 137, /* MPLS in IP. */ #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. */ -#define IPPROTO_MPTCP IPPROTO_MPTCP IPPROTO_MAX };