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

[linux-2.6-block.git] / drivers / infiniband / sw / rxe / rxe_verbs.h

diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.h b/drivers/infiniband/sw/rxe/rxe_verbs.h
index ccb9d19ffe8ab37b907dec8f03649b3e754ce7a8..3c1354f82283e6c68d6bfa64286f33478598357f 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_verbs.h
+++ b/drivers/infiniband/sw/rxe/rxe_verbs.h
@@ -113,7 +113,7 @@ struct rxe_req_info {
        int                     need_retry;
        int                     wait_for_rnr_timer;
        int                     noack_pkts;
-       struct rxe_task         task;
+       int                     again;
 };
 
 struct rxe_comp_info {
@@ -124,7 +124,6 @@ struct rxe_comp_info {
        int                     started_retry;
        u32                     retry_cnt;
        u32                     rnr_retry;
-       struct rxe_task         task;
 };
 
 enum rdatm_res_state {
@@ -196,7 +195,6 @@ struct rxe_resp_info {
        unsigned int            res_head;
        unsigned int            res_tail;
        struct resp_res         *res;
-       struct rxe_task         task;
 };
 
 struct rxe_qp {
@@ -229,6 +227,9 @@ struct rxe_qp {
        struct sk_buff_head     req_pkts;
        struct sk_buff_head     resp_pkts;
 
+       struct rxe_task         send_task;
+       struct rxe_task         recv_task;
+
        struct rxe_req_info     req;
        struct rxe_comp_info    comp;
        struct rxe_resp_info    resp;