Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

[platform/kernel/linux-starfive.git] / drivers / infiniband / ulp / rtrs / rtrs.h

diff --git a/drivers/infiniband/ulp/rtrs/rtrs.h b/drivers/infiniband/ulp/rtrs/rtrs.h
index 966c1e5..dc3e1af 100644 (file)
--- a/drivers/infiniband/ulp/rtrs/rtrs.h
+++ b/drivers/infiniband/ulp/rtrs/rtrs.h
@@ -58,14 +58,13 @@ struct rtrs_clt *rtrs_clt_open(struct rtrs_clt_ops *ops,
                                 size_t path_cnt, u16 port,
                                 size_t pdu_sz, u8 reconnect_delay_sec,
                                 u16 max_segments,
-                                size_t max_segment_size,
-                                s16 max_reconnect_attempts);
+                                s16 max_reconnect_attempts, u32 nr_poll_queues);
 
 void rtrs_clt_close(struct rtrs_clt *sess);
 
-enum {
+enum wait_type {
        RTRS_PERMIT_NOWAIT = 0,
-       RTRS_PERMIT_WAIT   = 1,
+       RTRS_PERMIT_WAIT   = 1
 };
 
 /**
@@ -81,7 +80,7 @@ enum rtrs_clt_con_type {
 
 struct rtrs_permit *rtrs_clt_get_permit(struct rtrs_clt *sess,
                                    enum rtrs_clt_con_type con_type,
-                                   int wait);
+                                   enum wait_type wait);
 
 void rtrs_clt_put_permit(struct rtrs_clt *sess, struct rtrs_permit *permit);
 
@@ -103,6 +102,7 @@ int rtrs_clt_request(int dir, struct rtrs_clt_req_ops *ops,
                     struct rtrs_clt *sess, struct rtrs_permit *permit,
                     const struct kvec *vec, size_t nr, size_t len,
                     struct scatterlist *sg, unsigned int sg_cnt);
+int rtrs_clt_rdma_cq_direct(struct rtrs_clt *clt, unsigned int index);
 
 /**
  * rtrs_attrs - RTRS session attributes
@@ -136,7 +136,6 @@ struct rtrs_srv_ops {
         *                      message for the data transfer will be sent to
         *                      the client.
 
-        *      @sess:          Session
         *      @priv:          Private data set by rtrs_srv_set_sess_priv()
         *      @id:            internal RTRS operation id
         *      @dir:           READ/WRITE
@@ -150,7 +149,7 @@ struct rtrs_srv_ops {
         *      @usr:           The extra user message sent by the client (%vec)
         *      @usrlen:        Size of the user message
         */
-       int (*rdma_ev)(struct rtrs_srv *sess, void *priv,
+       int (*rdma_ev)(void *priv,
                       struct rtrs_srv_op *id, int dir,
                       void *data, size_t datalen, const void *usr,
                       size_t usrlen);