From 3ff47ea6322fb4f7dee4093a14bbaeea747d1f6d Mon Sep 17 00:00:00 2001 From: Carmine Scarpitta Date: Thu, 20 Feb 2025 09:35:18 +0100 Subject: [PATCH] include: Update `include/seg6_iptunnel.h` This commit brings the include/seg6_iptunnel.h header fil from the latest kernel version. This update is needed to have the SEG6_IPTUN_MODE_ENCAP_RED enumeration value in FRR, which is required to support SRv6 H.Encaps.Red headend behavior. Signed-off-by: Carmine Scarpitta --- include/linux/seg6_iptunnel.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/include/linux/seg6_iptunnel.h b/include/linux/seg6_iptunnel.h index 3004e982c2..faa43b7942 100644 --- a/include/linux/seg6_iptunnel.h +++ b/include/linux/seg6_iptunnel.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */ +// SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note /* * SR-IPv6 implementation * @@ -12,8 +12,8 @@ * 2 of the License, or (at your option) any later version. */ -#ifndef _LINUX_SEG6_IPTUNNEL_H -#define _LINUX_SEG6_IPTUNNEL_H +#ifndef _UAPI_LINUX_SEG6_IPTUNNEL_H +#define _UAPI_LINUX_SEG6_IPTUNNEL_H #include /* For struct ipv6_sr_hdr. */ @@ -26,7 +26,7 @@ enum { struct seg6_iptunnel_encap { int mode; - struct ipv6_sr_hdr srh[0]; + struct ipv6_sr_hdr srh[]; }; #define SEG6_IPTUN_ENCAP_SIZE(x) ((sizeof(*x)) + (((x)->srh->hdrlen + 1) << 3)) @@ -35,7 +35,8 @@ enum { SEG6_IPTUN_MODE_INLINE, SEG6_IPTUN_MODE_ENCAP, SEG6_IPTUN_MODE_L2ENCAP, + SEG6_IPTUN_MODE_ENCAP_RED, + SEG6_IPTUN_MODE_L2ENCAP_RED, }; - #endif -- 2.39.5