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 4480e636b9348b789bd23805d8d2124095faa00c..c5c1435c129ab23c6a5ac9140a57f5da57b2224f 100644 (file)
--- a/include/rdma/rdma_cm.h
+++ b/include/rdma/rdma_cm.h
@@ -113,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;
 
 /**
@@ -434,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 */