uapi: update to pre 6.10-rc1 headers

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index 603e8019ba20812ccf53ec71772fa2f1c9e345ca..858a89984ec7b303fb18c94916a6961670c50358 100644 (file)
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -1115,6 +1115,7 @@ enum bpf_attach_type {
        BPF_CGROUP_UNIX_GETSOCKNAME,
        BPF_NETKIT_PRIMARY,
        BPF_NETKIT_PEER,
+       BPF_TRACE_KPROBE_SESSION,
        __MAX_BPF_ATTACH_TYPE
 };
 

diff --git a/include/uapi/linux/icmpv6.h b/include/uapi/linux/icmpv6.h
index fa6388c09793f94f642b1ec6b3f394d129f3ba25..f7c49aa80a9649cdc665af39554f8426ae3b2155 100644 (file)
--- a/include/uapi/linux/icmpv6.h
+++ b/include/uapi/linux/icmpv6.h
@@ -112,6 +112,7 @@ struct icmp6hdr {
 #define ICMPV6_MOBILE_PREFIX_ADV       147
 
 #define ICMPV6_MRDISC_ADV              151
+#define ICMPV6_MRDISC_SOL              152
 
 #define ICMPV6_MSG_MAX          255
 

diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index 7584f6921e7aca519567d0ae3caa7ceee4168e51..987efeddc30e987e1fd1b2d39dfc2024c644645f 100644 (file)
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -1464,6 +1464,8 @@ enum {
        IFLA_GTP_ROLE,
        IFLA_GTP_CREATE_SOCKETS,
        IFLA_GTP_RESTART_COUNT,
+       IFLA_GTP_LOCAL,
+       IFLA_GTP_LOCAL6,
        __IFLA_GTP_MAX,
 };
 #define IFLA_GTP_MAX (__IFLA_GTP_MAX - 1)

diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h
index 1b40a968ba91fc9d2d0a8339261584a0d89ff9a9..bb575f3ab45e59aff283602f8e7c8af13e8bcc6a 100644 (file)
--- a/include/uapi/linux/magic.h
+++ b/include/uapi/linux/magic.h
@@ -37,6 +37,7 @@
 #define HOSTFS_SUPER_MAGIC     0x00c0ffee
 #define OVERLAYFS_SUPER_MAGIC  0x794c7630
 #define FUSE_SUPER_MAGIC       0x65735546
+#define BCACHEFS_SUPER_MAGIC   0xca451a4e
 
 #define MINIX_SUPER_MAGIC      0x137F          /* minix v1 fs, 14 char names */
 #define MINIX_SUPER_MAGIC2     0x138F          /* minix v1 fs, 30 char names */

diff --git a/include/uapi/linux/snmp.h b/include/uapi/linux/snmp.h
index a0819c6a5988fc97b14fc23cac3911e70a14cbff..adf5fd78dd50301889a08ffedc1a59000970174b 100644 (file)
--- a/include/uapi/linux/snmp.h
+++ b/include/uapi/linux/snmp.h
@@ -337,6 +337,8 @@ enum
        LINUX_MIB_XFRMFWDHDRERROR,              /* XfrmFwdHdrError*/
        LINUX_MIB_XFRMOUTSTATEINVALID,          /* XfrmOutStateInvalid */
        LINUX_MIB_XFRMACQUIREERROR,             /* XfrmAcquireError */
+       LINUX_MIB_XFRMOUTSTATEDIRERROR,         /* XfrmOutStateDirError */
+       LINUX_MIB_XFRMINSTATEDIRERROR,          /* XfrmInStateDirError */
        __LINUX_MIB_XFRMMAX
 };
 

diff --git a/include/uapi/linux/stddef.h b/include/uapi/linux/stddef.h
index bf9749dd1422607dd57e1f64b8a39f0b32ab0ede..96aa341942b05003e605c05d69bc68b0eb528b2e 100644 (file)
--- a/include/uapi/linux/stddef.h
+++ b/include/uapi/linux/stddef.h
@@ -55,4 +55,12 @@
 #define __counted_by(m)
 #endif
 
+#ifndef __counted_by_le
+#define __counted_by_le(m)
+#endif
+
+#ifndef __counted_by_be
+#define __counted_by_be(m)
+#endif
+
 #endif /* _LINUX_STDDEF_H */

diff --git a/include/uapi/linux/tcp.h b/include/uapi/linux/tcp.h
index a1b9fb3f8d74fc48e5d5b7d43c125a63a601737c..03d1f22f5f480c20e99ca5d11d572475c246965b 100644 (file)
--- a/include/uapi/linux/tcp.h
+++ b/include/uapi/linux/tcp.h
@@ -135,6 +135,8 @@ enum {
 #define TCP_AO_GET_KEYS                41      /* List MKT(s) */
 #define TCP_AO_REPAIR          42      /* Get/Set SNEs and ISNs */
 
+#define TCP_IS_MPTCP           43      /* Is MPTCP being used? */
+
 #define TCP_REPAIR_ON          1
 #define TCP_REPAIR_OFF         0
 #define TCP_REPAIR_OFF_NO_WP   -1      /* Turn off without window probes */

diff --git a/include/uapi/linux/udp.h b/include/uapi/linux/udp.h
index d0a7223a0119cf0d123abc3720795a33e2e62f7b..241936346da80b115b8050deb667533591ed7f53 100644 (file)
--- a/include/uapi/linux/udp.h
+++ b/include/uapi/linux/udp.h
@@ -36,7 +36,7 @@ struct udphdr {
 #define UDP_GRO                104     /* This socket can receive UDP GRO packets */
 
 /* UDP encapsulation types */
-#define UDP_ENCAP_ESPINUDP_NON_IKE     1 /* draft-ietf-ipsec-nat-t-ike-00/01 */
+#define UDP_ENCAP_ESPINUDP_NON_IKE     1 /* unused  draft-ietf-ipsec-nat-t-ike-00/01 */
 #define UDP_ENCAP_ESPINUDP     2 /* draft-ietf-ipsec-udp-encaps-06 */
 #define UDP_ENCAP_L2TPINUDP    3 /* rfc2661 */
 #define UDP_ENCAP_GTP0         4 /* GSM TS 09.60 */

diff --git a/include/uapi/linux/xfrm.h b/include/uapi/linux/xfrm.h
index cc480c30cb5df5b2f321b3f3bc527f62c6bc4149..75d18850f02a318ca498d4810e84677a240666cd 100644 (file)
--- a/include/uapi/linux/xfrm.h
+++ b/include/uapi/linux/xfrm.h
@@ -141,6 +141,11 @@ enum {
        XFRM_POLICY_MAX = 3
 };
 
+enum xfrm_sa_dir {
+       XFRM_SA_DIR_IN  = 1,
+       XFRM_SA_DIR_OUT = 2
+};
+
 enum {
        XFRM_SHARE_ANY,         /* No limitations */
        XFRM_SHARE_SESSION,     /* For this session only */
@@ -315,6 +320,7 @@ enum xfrm_attr_type_t {
        XFRMA_SET_MARK_MASK,    /* __u32 */
        XFRMA_IF_ID,            /* __u32 */
        XFRMA_MTIMER_THRESH,    /* __u32 in seconds for input SA */
+       XFRMA_SA_DIR,           /* __u8 */
        __XFRMA_MAX
 
 #define XFRMA_OUTPUT_MARK XFRMA_SET_MARK       /* Compatibility */