Update kernel headers

Update kernel headers to commit:
59372af69d4d ("Merge tag 'batadv-next-pullrequest-20250117' of git://git.open-mesh.org/linux-merge")

Signed-off-by: David Ahern <dsahern@kernel.org>

diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index a86060602c784c7500eef4acfcc92a752d669839..79e97dd1fcdc8b803c0e0d080993a9dd3b5fdee2 100644 (file)
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -1313,6 +1313,8 @@ enum {
        IFLA_NETKIT_MODE,
        IFLA_NETKIT_SCRUB,
        IFLA_NETKIT_PEER_SCRUB,
+       IFLA_NETKIT_HEADROOM,
+       IFLA_NETKIT_TAILROOM,
        __IFLA_NETKIT_MAX,
 };
 #define IFLA_NETKIT_MAX        (__IFLA_NETKIT_MAX - 1)

diff --git a/include/uapi/linux/in.h b/include/uapi/linux/in.h
index a7d41bb6c68736cc53f258dc82456a64dd708eaa..d59654e9084abeaa551c84cb05c4b66bd35a06f4 100644 (file)
--- a/include/uapi/linux/in.h
+++ b/include/uapi/linux/in.h
@@ -79,6 +79,8 @@ enum {
 #define IPPROTO_MPLS           IPPROTO_MPLS
   IPPROTO_ETHERNET = 143,      /* Ethernet-within-IPv6 Encapsulation   */
 #define IPPROTO_ETHERNET       IPPROTO_ETHERNET
+  IPPROTO_AGGFRAG = 144,       /* AGGFRAG in ESP (RFC 9347)            */
+#define IPPROTO_AGGFRAG                IPPROTO_AGGFRAG
   IPPROTO_RAW = 255,           /* Raw IP packets                       */
 #define IPPROTO_RAW            IPPROTO_RAW
   IPPROTO_SMC = 256,           /* Shared Memory Communications         */

diff --git a/include/uapi/linux/ip.h b/include/uapi/linux/ip.h
index 9b4dd89ebecbcad3e6a2523ef3fe2defa5e2998b..83e53bc18a7f44ffebe368a4c4315a4c1065cad5 100644 (file)
--- a/include/uapi/linux/ip.h
+++ b/include/uapi/linux/ip.h
@@ -137,6 +137,22 @@ struct ip_beet_phdr {
        __u8 reserved;
 };
 
+struct ip_iptfs_hdr {
+       __u8 subtype;           /* 0*: basic, 1: CC */
+       __u8 flags;
+       __be16 block_offset;
+};
+
+struct ip_iptfs_cc_hdr {
+       __u8 subtype;           /* 0: basic, 1*: CC */
+       __u8 flags;
+       __be16 block_offset;
+       __be32 loss_rate;
+       __be64 rtt_adelay_xdelay;
+       __be32 tval;
+       __be32 techo;
+};
+
 /* index values for the variables in ipv4_devconf */
 enum
 {

diff --git a/include/uapi/linux/ipsec.h b/include/uapi/linux/ipsec.h
index 50d8ee1791e2a69a72ad90738debe593fd85238f..696b790f43462048958757d5b1d22e91508162e3 100644 (file)
--- a/include/uapi/linux/ipsec.h
+++ b/include/uapi/linux/ipsec.h
@@ -14,7 +14,8 @@ enum {
        IPSEC_MODE_ANY          = 0,    /* We do not support this for SA */
        IPSEC_MODE_TRANSPORT    = 1,
        IPSEC_MODE_TUNNEL       = 2,
-       IPSEC_MODE_BEET         = 3
+       IPSEC_MODE_BEET         = 3,
+       IPSEC_MODE_IPTFS        = 4
 };
 
 enum {

diff --git a/include/uapi/linux/mptcp_pm.h b/include/uapi/linux/mptcp_pm.h
index a66f18afad1d163c43234a0e49d553e537a7b8df..2f59b1a6c1f91676b0ee02263157ac4d8964bb3a 100644 (file)
--- a/include/uapi/linux/mptcp_pm.h
+++ b/include/uapi/linux/mptcp_pm.h
@@ -12,31 +12,33 @@
 /**
  * enum mptcp_event_type
  * @MPTCP_EVENT_UNSPEC: unused event
- * @MPTCP_EVENT_CREATED: token, family, saddr4 | saddr6, daddr4 | daddr6,
- *   sport, dport A new MPTCP connection has been created. It is the good time
- *   to allocate memory and send ADD_ADDR if needed. Depending on the
+ * @MPTCP_EVENT_CREATED: A new MPTCP connection has been created. It is the
+ *   good time to allocate memory and send ADD_ADDR if needed. Depending on the
  *   traffic-patterns it can take a long time until the MPTCP_EVENT_ESTABLISHED
- *   is sent.
- * @MPTCP_EVENT_ESTABLISHED: token, family, saddr4 | saddr6, daddr4 | daddr6,
- *   sport, dport A MPTCP connection is established (can start new subflows).
- * @MPTCP_EVENT_CLOSED: token A MPTCP connection has stopped.
- * @MPTCP_EVENT_ANNOUNCED: token, rem_id, family, daddr4 | daddr6 [, dport] A
- *   new address has been announced by the peer.
- * @MPTCP_EVENT_REMOVED: token, rem_id An address has been lost by the peer.
- * @MPTCP_EVENT_SUB_ESTABLISHED: token, family, loc_id, rem_id, saddr4 |
- *   saddr6, daddr4 | daddr6, sport, dport, backup, if_idx [, error] A new
- *   subflow has been established. 'error' should not be set.
- * @MPTCP_EVENT_SUB_CLOSED: token, family, loc_id, rem_id, saddr4 | saddr6,
- *   daddr4 | daddr6, sport, dport, backup, if_idx [, error] A subflow has been
- *   closed. An error (copy of sk_err) could be set if an error has been
- *   detected for this subflow.
- * @MPTCP_EVENT_SUB_PRIORITY: token, family, loc_id, rem_id, saddr4 | saddr6,
- *   daddr4 | daddr6, sport, dport, backup, if_idx [, error] The priority of a
- *   subflow has changed. 'error' should not be set.
- * @MPTCP_EVENT_LISTENER_CREATED: family, sport, saddr4 | saddr6 A new PM
- *   listener is created.
- * @MPTCP_EVENT_LISTENER_CLOSED: family, sport, saddr4 | saddr6 A PM listener
- *   is closed.
+ *   is sent. Attributes: token, family, saddr4 | saddr6, daddr4 | daddr6,
+ *   sport, dport, server-side.
+ * @MPTCP_EVENT_ESTABLISHED: A MPTCP connection is established (can start new
+ *   subflows). Attributes: token, family, saddr4 | saddr6, daddr4 | daddr6,
+ *   sport, dport, server-side.
+ * @MPTCP_EVENT_CLOSED: A MPTCP connection has stopped. Attribute: token.
+ * @MPTCP_EVENT_ANNOUNCED: A new address has been announced by the peer.
+ *   Attributes: token, rem_id, family, daddr4 | daddr6 [, dport].
+ * @MPTCP_EVENT_REMOVED: An address has been lost by the peer. Attributes:
+ *   token, rem_id.
+ * @MPTCP_EVENT_SUB_ESTABLISHED: A new subflow has been established. 'error'
+ *   should not be set. Attributes: token, family, loc_id, rem_id, saddr4 |
+ *   saddr6, daddr4 | daddr6, sport, dport, backup, if_idx [, error].
+ * @MPTCP_EVENT_SUB_CLOSED: A subflow has been closed. An error (copy of
+ *   sk_err) could be set if an error has been detected for this subflow.
+ *   Attributes: token, family, loc_id, rem_id, saddr4 | saddr6, daddr4 |
+ *   daddr6, sport, dport, backup, if_idx [, error].
+ * @MPTCP_EVENT_SUB_PRIORITY: The priority of a subflow has changed. 'error'
+ *   should not be set. Attributes: token, family, loc_id, rem_id, saddr4 |
+ *   saddr6, daddr4 | daddr6, sport, dport, backup, if_idx [, error].
+ * @MPTCP_EVENT_LISTENER_CREATED: A new PM listener is created. Attributes:
+ *   family, sport, saddr4 | saddr6.
+ * @MPTCP_EVENT_LISTENER_CLOSED: A PM listener is closed. Attributes: family,
+ *   sport, saddr4 | saddr6.
  */
 enum mptcp_event_type {
        MPTCP_EVENT_UNSPEC,

diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h
index 478c9d836a7b2b4916445308eed62627c568bc03..6c652145d8e704bbf2d144482b7d5ad827fb9545 100644 (file)
--- a/include/uapi/linux/rtnetlink.h
+++ b/include/uapi/linux/rtnetlink.h
@@ -100,7 +100,11 @@ enum {
        RTM_GETMULTICAST,
 #define RTM_GETMULTICAST RTM_GETMULTICAST
 
-       RTM_GETANYCAST  = 62,
+       RTM_NEWANYCAST  = 60,
+#define RTM_NEWANYCAST RTM_NEWANYCAST
+       RTM_DELANYCAST,
+#define RTM_DELANYCAST RTM_DELANYCAST
+       RTM_GETANYCAST,
 #define RTM_GETANYCAST RTM_GETANYCAST
 
        RTM_NEWNEIGHTBL = 64,
@@ -781,6 +785,8 @@ enum rtnetlink_groups {
 #define RTNLGRP_IPV4_MCADDR    RTNLGRP_IPV4_MCADDR
        RTNLGRP_IPV6_MCADDR,
 #define RTNLGRP_IPV6_MCADDR    RTNLGRP_IPV6_MCADDR
+       RTNLGRP_IPV6_ACADDR,
+#define RTNLGRP_IPV6_ACADDR    RTNLGRP_IPV6_ACADDR
        __RTNLGRP_MAX
 };
 #define RTNLGRP_MAX    (__RTNLGRP_MAX - 1)

diff --git a/include/uapi/linux/snmp.h b/include/uapi/linux/snmp.h
index 51da2e00112de51de9fa5835ae2a514a01c9527c..848c7784e684c03bdf743e42594317f3d889d83f 100644 (file)
--- a/include/uapi/linux/snmp.h
+++ b/include/uapi/linux/snmp.h
@@ -186,6 +186,7 @@ enum
        LINUX_MIB_TIMEWAITKILLED,               /* TimeWaitKilled */
        LINUX_MIB_PAWSACTIVEREJECTED,           /* PAWSActiveRejected */
        LINUX_MIB_PAWSESTABREJECTED,            /* PAWSEstabRejected */
+       LINUX_MIB_PAWS_OLD_ACK,                 /* PAWSOldAck */
        LINUX_MIB_DELAYEDACKS,                  /* DelayedACKs */
        LINUX_MIB_DELAYEDACKLOCKED,             /* DelayedACKLocked */
        LINUX_MIB_DELAYEDACKLOST,               /* DelayedACKLost */
@@ -339,6 +340,8 @@ enum
        LINUX_MIB_XFRMACQUIREERROR,             /* XfrmAcquireError */
        LINUX_MIB_XFRMOUTSTATEDIRERROR,         /* XfrmOutStateDirError */
        LINUX_MIB_XFRMINSTATEDIRERROR,          /* XfrmInStateDirError */
+       LINUX_MIB_XFRMINIPTFSERROR,             /* XfrmInIptfsError */
+       LINUX_MIB_XFRMOUTNOQSPACE,              /* XfrmOutNoQueueSpace */
        __LINUX_MIB_XFRMMAX
 };
 

diff --git a/include/uapi/linux/stddef.h b/include/uapi/linux/stddef.h
index 96aa341942b05003e605c05d69bc68b0eb528b2e..e1416f793738f56beb5b47447f1c422eb103da72 100644 (file)
--- a/include/uapi/linux/stddef.h
+++ b/include/uapi/linux/stddef.h
@@ -8,6 +8,13 @@
 #define __always_inline __inline__
 #endif
 
+/* Not all C++ standards support type declarations inside an anonymous union */
+#ifndef __cplusplus
+#define __struct_group_tag(TAG)                TAG
+#else
+#define __struct_group_tag(TAG)
+#endif
+
 /**
  * __struct_group() - Create a mirrored named and anonyomous struct
  *
@@ -20,13 +27,13 @@
  * and size: one anonymous and one named. The former's members can be used
  * normally without sub-struct naming, and the latter can be used to
  * reason about the start, end, and size of the group of struct members.
- * The named struct can also be explicitly tagged for layer reuse, as well
- * as both having struct attributes appended.
+ * The named struct can also be explicitly tagged for layer reuse (C only),
+ * as well as both having struct attributes appended.
  */
 #define __struct_group(TAG, NAME, ATTRS, MEMBERS...) \
        union { \
                struct { MEMBERS } ATTRS; \
-               struct TAG { MEMBERS } ATTRS NAME; \
+               struct __struct_group_tag(TAG) { MEMBERS } ATTRS NAME; \
        } ATTRS
 
 #ifdef __cplusplus

diff --git a/include/uapi/linux/xfrm.h b/include/uapi/linux/xfrm.h
index f4d5c151786f36abd76cf2d510da61cc4b933d4a..f4248609fa7581d4fa772f85499dace6d55d3b72 100644 (file)
--- a/include/uapi/linux/xfrm.h
+++ b/include/uapi/linux/xfrm.h
@@ -158,7 +158,8 @@ enum {
 #define XFRM_MODE_ROUTEOPTIMIZATION 2
 #define XFRM_MODE_IN_TRIGGER 3
 #define XFRM_MODE_BEET 4
-#define XFRM_MODE_MAX 5
+#define XFRM_MODE_IPTFS 5
+#define XFRM_MODE_MAX 6
 
 /* Netlink configuration messages.  */
 enum {
@@ -323,6 +324,12 @@ enum xfrm_attr_type_t {
        XFRMA_SA_DIR,           /* __u8 */
        XFRMA_NAT_KEEPALIVE_INTERVAL,   /* __u32 in seconds for NAT keepalive */
        XFRMA_SA_PCPU,          /* __u32 */
+       XFRMA_IPTFS_DROP_TIME,  /* __u32 in: usec to wait for next seq */
+       XFRMA_IPTFS_REORDER_WINDOW, /* __u16 in: reorder window size (pkts) */
+       XFRMA_IPTFS_DONT_FRAG,  /* out: don't use fragmentation */
+       XFRMA_IPTFS_INIT_DELAY, /* __u32 out: initial packet wait delay (usec) */
+       XFRMA_IPTFS_MAX_QSIZE,  /* __u32 out: max ingress queue size (octets) */
+       XFRMA_IPTFS_PKT_SIZE,   /* __u32 out: size of outer packet, 0 for PMTU */
        __XFRMA_MAX
 
 #define XFRMA_OUTPUT_MARK XFRMA_SET_MARK       /* Compatibility */