Merge branch 'linux-2.6'

[linux-2.6] / include / rdma / ib_user_cm.h

diff --git a/include/rdma/ib_user_cm.h b/include/rdma/ib_user_cm.h
index a9e1b22d245c38052587d29a863f4f74a2c62167..37650afb982c7ee85608157ea4df5118968fa82f 100644 (file)
--- a/include/rdma/ib_user_cm.h
+++ b/include/rdma/ib_user_cm.h
@@ -38,7 +38,7 @@
 
 #include <rdma/ib_user_sa.h>
 
-#define IB_USER_CM_ABI_VERSION 4
+#define IB_USER_CM_ABI_VERSION 5
 
 enum {
        IB_USER_CM_CMD_CREATE_ID,
@@ -46,7 +46,7 @@ enum {
        IB_USER_CM_CMD_ATTR_ID,
 
        IB_USER_CM_CMD_LISTEN,
-       IB_USER_CM_CMD_ESTABLISH,
+       IB_USER_CM_CMD_NOTIFY,
 
        IB_USER_CM_CMD_SEND_REQ,
        IB_USER_CM_CMD_SEND_REP,
@@ -117,8 +117,9 @@ struct ib_ucm_listen {
        __u32 reserved;
 };
 
-struct ib_ucm_establish {
+struct ib_ucm_notify {
        __u32 id;
+       __u32 event;
 };
 
 struct ib_ucm_private_data {
@@ -200,7 +201,7 @@ struct ib_ucm_sidr_req {
        __be64 sid;
        __u64 data;
        __u64 path;
-       __u16 pkey;
+       __u16 reserved_pkey;
        __u8  len;
        __u8  max_cm_retries;
        __u8  reserved[4];