Merge tag 'staging-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[linux.git] / include / rdma / rdma_cm.h

diff --git a/include/rdma/rdma_cm.h b/include/rdma/rdma_cm.h
index 7652efc35eb984db98a1ed6a79c0bebe2362ef54..c5c1435c129ab23c6a5ac9140a57f5da57b2224f 100644 (file)
--- a/include/rdma/rdma_cm.h
+++ b/include/rdma/rdma_cm.h
@@ -38,6 +38,7 @@
 #include <linux/in6.h>
 #include <rdma/ib_addr.h>
 #include <rdma/ib_sa.h>
+#include <uapi/rdma/rdma_user_cm.h>
 
 /*
  * Upon receiving a device removal event, users must destroy the associated
@@ -64,13 +65,6 @@ enum rdma_cm_event_type {
 
 const char *__attribute_const__ rdma_event_msg(enum rdma_cm_event_type event);
 
-enum rdma_port_space {
-       RDMA_PS_IPOIB = 0x0002,
-       RDMA_PS_IB    = 0x013F,
-       RDMA_PS_TCP   = 0x0106,
-       RDMA_PS_UDP   = 0x0111,
-};
-
 #define RDMA_IB_IP_PS_MASK   0xFFFFFFFFFFFF0000ULL
 #define RDMA_IB_IP_PS_TCP    0x0000000001060000ULL
 #define RDMA_IB_IP_PS_UDP    0x0000000001110000ULL
@@ -119,20 +113,6 @@ struct rdma_cm_event {
        } param;
 };
 
-enum rdma_cm_state {
-       RDMA_CM_IDLE,
-       RDMA_CM_ADDR_QUERY,
-       RDMA_CM_ADDR_RESOLVED,
-       RDMA_CM_ROUTE_QUERY,
-       RDMA_CM_ROUTE_RESOLVED,
-       RDMA_CM_CONNECT,
-       RDMA_CM_DISCONNECT,
-       RDMA_CM_ADDR_BOUND,
-       RDMA_CM_LISTEN,
-       RDMA_CM_DEVICE_REMOVAL,
-       RDMA_CM_DESTROYING
-};
-
 struct rdma_cm_id;
 
 /**
@@ -151,15 +131,16 @@ struct rdma_cm_id {
        struct ib_qp            *qp;
        rdma_cm_event_handler    event_handler;
        struct rdma_route        route;
-       enum rdma_port_space     ps;
+       enum rdma_ucm_port_space ps;
        enum ib_qp_type          qp_type;
        u8                       port_num;
 };
 
 struct rdma_cm_id *__rdma_create_id(struct net *net,
-                                 rdma_cm_event_handler event_handler,
-                                 void *context, enum rdma_port_space ps,
-                                 enum ib_qp_type qp_type, const char *caller);
+                                   rdma_cm_event_handler event_handler,
+                                   void *context, enum rdma_ucm_port_space ps,
+                                   enum ib_qp_type qp_type,
+                                   const char *caller);
 
 /**
  * rdma_create_id - Create an RDMA identifier.
@@ -439,4 +420,7 @@ const void *rdma_consumer_reject_data(struct rdma_cm_id *id,
 void rdma_read_gids(struct rdma_cm_id *cm_id, union ib_gid *sgid,
                    union ib_gid *dgid);
 
+struct iw_cm_id *rdma_iw_cm_id(struct rdma_cm_id *cm_id);
+struct rdma_cm_id *rdma_res_to_id(struct rdma_restrack_entry *res);
+
 #endif /* RDMA_CM_H */