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

Message ID alpine.DEB.2.21.2004022144570.22726@digraph.polyomino.org.uk
State Committed
Commit f9ac84f92f151e07586c55e14ed628d493a5929d
Headers
Series Add IPPROTO_ETHERNET and IPPROTO_MPTCP from Linux 5.6 to netinet/in.h |

Commit Message

Joseph Myers April 2, 2020, 9:45 p.m. UTC
  This patch adds the IPPROTO_ETHERNET and IPPROTO_MPTCP constants from
Linux 5.6 to glibc's netinet/in.h.

Tested for x86_64.
  

Comments

Adhemerval Zanella April 3, 2020, 1:45 p.m. UTC | #1
On 02/04/2020 18:45, Joseph Myers wrote:
> This patch adds the IPPROTO_ETHERNET and IPPROTO_MPTCP constants from
> Linux 5.6 to glibc's netinet/in.h.
> 
> Tested for x86_64.

LGTM, it adds the changes done by faf391c3826c and 564200ed8e71.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>

> 
> 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
>    };
>  
>
  

Patch

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
   };