From: Alistair Francis <alistair.francis@wdc.com>
Date: Wed, 8 Apr 2020 21:43:47 +0000 (-0700)
Subject: Revert "Add IPPROTO_ETHERNET and IPPROTO_MPTCP from Linux 5.6 to netinet/in.h."
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Falistair%2Frv32.next;p=thirdparty%2Fglibc.git

Revert "Add IPPROTO_ETHERNET and IPPROTO_MPTCP from Linux 5.6 to netinet/in.h."

This reverts commit f9ac84f92f151e07586c55e14ed628d493a5929d.
---

diff --git a/inet/netinet/in.h b/inet/netinet/in.h
index f6355c7efe5..95eaf68dfee 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
   };