rdma: update uapi headers from 5.1-rc1

Update from upstream.

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

diff --git a/rdma/include/uapi/rdma/ib_user_verbs.h b/rdma/include/uapi/rdma/ib_user_verbs.h
index 480d9a60b68e475a7dcd20fe326cbe9706ba11c2..0474c74002685d9c75cff30fd9faf88f1d9c4337 100644 (file)
--- a/rdma/include/uapi/rdma/ib_user_verbs.h
+++ b/rdma/include/uapi/rdma/ib_user_verbs.h
@@ -270,6 +270,8 @@ struct ib_uverbs_ex_query_device_resp {
        struct ib_uverbs_tm_caps tm_caps;
        struct ib_uverbs_cq_moderation_caps cq_moderation_caps;
        __aligned_u64 max_dm_size;
+       __u32 xrc_odp_caps;
+       __u32 reserved;
 };
 
 struct ib_uverbs_query_port {

diff --git a/rdma/include/uapi/rdma/rdma_netlink.h b/rdma/include/uapi/rdma/rdma_netlink.h
index 5027c6274ded5a2ec60f4d88b24e2669d4b0b632..23a90ad52485c713b1f3c15ef70473b04861407c 100644 (file)
--- a/rdma/include/uapi/rdma/rdma_netlink.h
+++ b/rdma/include/uapi/rdma/rdma_netlink.h
@@ -255,9 +255,11 @@ enum rdma_nldev_command {
        RDMA_NLDEV_CMD_GET, /* can dump */
        RDMA_NLDEV_CMD_SET,
 
-       /* 3 - 4 are free to use */
+       RDMA_NLDEV_CMD_NEWLINK,
 
-       RDMA_NLDEV_CMD_PORT_GET = 5, /* can dump */
+       RDMA_NLDEV_CMD_DELLINK,
+
+       RDMA_NLDEV_CMD_PORT_GET, /* can dump */
 
        /* 6 - 8 are free to use */
 
@@ -465,6 +467,10 @@ enum rdma_nldev_attr {
        RDMA_NLDEV_ATTR_RES_MRN,               /* u32 */
        RDMA_NLDEV_ATTR_RES_CM_IDN,            /* u32 */
        RDMA_NLDEV_ATTR_RES_CTXN,              /* u32 */
+       /*
+        * Identifies the rdma driver. eg: "rxe" or "siw"
+        */
+       RDMA_NLDEV_ATTR_LINK_TYPE,              /* string */
 
        /*
         * Always the end

diff --git a/rdma/include/uapi/rdma/rdma_user_cm.h b/rdma/include/uapi/rdma/rdma_user_cm.h
index 0d1e78ebad05154097ffa8b3bfb8708f5c7a0cb3..e42940a215a3058845e3e4971b6b7ea5cdd644e7 100644 (file)
--- a/rdma/include/uapi/rdma/rdma_user_cm.h
+++ b/rdma/include/uapi/rdma/rdma_user_cm.h
@@ -300,6 +300,10 @@ enum {
        RDMA_OPTION_ID_TOS       = 0,
        RDMA_OPTION_ID_REUSEADDR = 1,
        RDMA_OPTION_ID_AFONLY    = 2,
+       RDMA_OPTION_ID_ACK_TIMEOUT = 3
+};
+
+enum {
        RDMA_OPTION_IB_PATH      = 1
 };