uapi: update mptcp and rdma headers

Update from 6.19-rc3

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

diff --git a/include/uapi/linux/mptcp.h b/include/uapi/linux/mptcp.h
index 9f214ab917d0feddd855fe3de96869ab7e4a24df..5cf86857b08a2d9a9e5ca46143f26921d20f5e12 100644 (file)
--- a/include/uapi/linux/mptcp.h
+++ b/include/uapi/linux/mptcp.h
@@ -38,6 +38,7 @@
 #define MPTCP_PM_ADDR_FLAG_FULLMESH            _BITUL(3)
 #define MPTCP_PM_ADDR_FLAG_IMPLICIT            _BITUL(4)
 #define MPTCP_PM_ADDR_FLAG_LAMINAR             _BITUL(5)
+#define MPTCP_PM_ADDR_FLAGS_MASK               GENMASK(5, 0)
 
 struct mptcp_info {
        __u8    mptcpi_subflows;

diff --git a/rdma/include/uapi/rdma/rdma_user_cm.h b/rdma/include/uapi/rdma/rdma_user_cm.h
index 5ded174687ee045ee1144ac9b9ce00a55377449b..838f8d4602560365690294e6641dc65c286055e5 100644 (file)
--- a/rdma/include/uapi/rdma/rdma_user_cm.h
+++ b/rdma/include/uapi/rdma/rdma_user_cm.h
@@ -192,6 +192,7 @@ struct rdma_ucm_query_path_resp {
 
 struct rdma_ucm_query_ib_service_resp {
        __u32 num_service_recs;
+       __u32 reserved;
        struct ib_user_service_rec recs[];
 };
 
@@ -354,7 +355,7 @@ enum {
 
 #define RDMA_USER_CM_IB_SERVICE_NAME_SIZE 64
 struct rdma_ucm_ib_service {
-       __u64 service_id;
+       __aligned_u64 service_id;
        __u8  service_name[RDMA_USER_CM_IB_SERVICE_NAME_SIZE];
        __u32 flags;
        __u32 reserved;
@@ -362,6 +363,7 @@ struct rdma_ucm_ib_service {
 
 struct rdma_ucm_resolve_ib_service {
        __u32 id;
+       __u32 reserved;
        struct rdma_ucm_ib_service ibs;
 };