Add IPPROTO_L2TP from Linux 6.1 to netinet/in.h

Message ID 1ef32960-f07a-7021-d9a6-6396c4dbbc93@codesourcery.com
State Committed
Commit b5e3d66b964569acc919199ee34f3e9c28c5d6d0
Headers
Series Add IPPROTO_L2TP from Linux 6.1 to netinet/in.h |

Checks

Context Check Description
dj/TryBot-apply_patch success Patch applied to master at the time it was sent
dj/TryBot-32bit success Build for i686

Commit Message

Joseph Myers Jan. 9, 2023, 9:50 p.m. UTC
  Linux 6.1 adds a define IPPROTO_L2TP to its include/uapi/linux/in.h
(not strictly a new constant, since it's moved from
include/uapi/linux/l2tp.h).  Add this constant to glibc's
netinet/in.h.

Tested for x86_64.
  

Comments

Joseph Myers Jan. 17, 2023, 5:49 p.m. UTC | #1
Ping.  This patch 
<https://sourceware.org/pipermail/libc-alpha/2023-January/144563.html> is 
pending review.
  
Adhemerval Zanella Netto Jan. 17, 2023, 8:07 p.m. UTC | #2
On 09/01/23 18:50, Joseph Myers wrote:
> Linux 6.1 adds a define IPPROTO_L2TP to its include/uapi/linux/in.h
> (not strictly a new constant, since it's moved from
> include/uapi/linux/l2tp.h).  Add this constant to glibc's
> netinet/in.h.
> 
> Tested for x86_64.

LGTM, thanks.

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

> 
> diff --git a/inet/netinet/in.h b/inet/netinet/in.h
> index 858652cc37..60deab2f99 100644
> --- a/inet/netinet/in.h
> +++ b/inet/netinet/in.h
> @@ -81,6 +81,8 @@ enum
>  #define IPPROTO_PIM		IPPROTO_PIM
>      IPPROTO_COMP = 108,	   /* Compression Header Protocol.  */
>  #define IPPROTO_COMP		IPPROTO_COMP
> +    IPPROTO_L2TP = 115,	   /* Layer 2 Tunnelling Protocol.  */
> +#define IPPROTO_L2TP		IPPROTO_L2TP
>      IPPROTO_SCTP = 132,	   /* Stream Control Transmission Protocol.  */
>  #define IPPROTO_SCTP		IPPROTO_SCTP
>      IPPROTO_UDPLITE = 136, /* UDP-Lite protocol.  */
>
  

Patch

diff --git a/inet/netinet/in.h b/inet/netinet/in.h
index 858652cc37..60deab2f99 100644
--- a/inet/netinet/in.h
+++ b/inet/netinet/in.h
@@ -81,6 +81,8 @@  enum
 #define IPPROTO_PIM		IPPROTO_PIM
     IPPROTO_COMP = 108,	   /* Compression Header Protocol.  */
 #define IPPROTO_COMP		IPPROTO_COMP
+    IPPROTO_L2TP = 115,	   /* Layer 2 Tunnelling Protocol.  */
+#define IPPROTO_L2TP		IPPROTO_L2TP
     IPPROTO_SCTP = 132,	   /* Stream Control Transmission Protocol.  */
 #define IPPROTO_SCTP		IPPROTO_SCTP
     IPPROTO_UDPLITE = 136, /* UDP-Lite protocol.  */