public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Alistair Francis <alistair23@sourceware.org>
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."
Date: Wed, 22 Apr 2020 22:16:50 +0000 (GMT)	[thread overview]
Message-ID: <20200422221650.BE6C439540BC@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=451786b99d6aa8b5e953ac8ddc1c10ff953cd376

commit 451786b99d6aa8b5e953ac8ddc1c10ff953cd376
Author: Alistair Francis <alistair.francis@wdc.com>
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
   };


             reply	other threads:[~2020-04-22 22:16 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-22 22:16 Alistair Francis [this message]
2020-04-26  2:26 Alistair Francis

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200422221650.BE6C439540BC@sourceware.org \
    --to=alistair23@sourceware.org \
    --cc=glibc-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).