From patchwork Thu Apr 2 21:45:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 38717 Return-Path: X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from esa2.mentor.iphmx.com (esa2.mentor.iphmx.com [68.232.141.98]) by sourceware.org (Postfix) with ESMTPS id 7A8C7385BF92 for ; Thu, 2 Apr 2020 21:45:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 7A8C7385BF92 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=joseph_myers@mentor.com IronPort-SDR: TQJkvDiKjLCr34sRQSAoSDdQWPcPbsEr3Zc0qJ538w/DBy2YpgEJieA5+pP03KgOISJrYsY9K6 tuMsOA95jjsUrNwgXgPDBK15lBzUYizblPaj+NmljlHnS6TDCg9iN6jGadhKvgu15p05h9ZgNK y9x3sTSmam3zKxKA7HjMBWgvKmPSl59ZWeSB4L3/geE9FQbwoeh/K60FHzToY7QWkD1PRQDZKK p0cfsyduPSib5a5RYnu+gEnfJwHjzxhD/cYB9w+VeDc5ySbXrweYjaOndHL3R4UII0ku7R7O5J nwo= X-IronPort-AV: E=Sophos;i="5.72,337,1580803200"; d="scan'208";a="47313355" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa2.mentor.iphmx.com with ESMTP; 02 Apr 2020 13:45:16 -0800 IronPort-SDR: VU32rGAwTlkakel82EclbZPWEhNznHxKp7vupEIL6dpj0imMRerHck/9DGMECg/0ZMS1AuppDZ CCUaZcCkPzS8bOD4d5OPGCZyCAI706NYYgUwIhoT8Gw5ZyoiyQkl31x9CpT/PBmxEjdzVH8DFX xjHJuJZiNFHCjfggT0QvFxDRzG0vfScO2P9/uF6LMaUckDNQE7X3kIyMBmSc8pTPsp7UXJ3MAk MfWnW4cO/byAVxsvksAEnIHRc08lmJ2sksPzU4+mOru0VZfpmHo7iuAZBG2q+gCiu90kzGeRzK 1QQ= Date: Thu, 2 Apr 2020 21:45:11 +0000 From: Joseph Myers X-X-Sender: jsm28@digraph.polyomino.org.uk To: Subject: Add IPPROTO_ETHERNET and IPPROTO_MPTCP from Linux 5.6 to netinet/in.h Message-ID: User-Agent: Alpine 2.21 (DEB 202 2017-01-01) MIME-Version: 1.0 X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-02.mgc.mentorg.com (139.181.222.2) To SVR-IES-MBX-03.mgc.mentorg.com (139.181.222.3) X-Spam-Status: No, score=-21.6 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Apr 2020 21:45:19 -0000 This patch adds the IPPROTO_ETHERNET and IPPROTO_MPTCP constants from Linux 5.6 to glibc's netinet/in.h. Tested for x86_64. Reviewed-by: Adhemerval Zanella diff --git a/inet/netinet/in.h b/inet/netinet/in.h index 95eaf68dfe..f6355c7efe 100644 --- a/inet/netinet/in.h +++ b/inet/netinet/in.h @@ -87,8 +87,12 @@ 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 };