diff options
| author | Doug Ledford <dledford@redhat.com> | 2017-04-20 12:00:41 -0400 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2017-04-20 12:00:41 -0400 |
| commit | 23790ba2d775698ed44ef37b8c72b94c73ae5a6c (patch) | |
| tree | 90ad0754a5ffd73d28105d56b44fe038700d81ed /include/rdma/rdmavt_qp.h | |
| parent | 70d40b366d2f7c2facaa3bc20f26e562e91ce94d (diff) | |
| parent | db1b5ddd53365a07a7754803bdba370ebb84ba19 (diff) | |
| download | blackbird-obmc-linux-23790ba2d775698ed44ef37b8c72b94c73ae5a6c.tar.gz blackbird-obmc-linux-23790ba2d775698ed44ef37b8c72b94c73ae5a6c.zip | |
Merge branch 'k.o/for-4.12' into k.o/for-4.12-rdma-netdevice
Diffstat (limited to 'include/rdma/rdmavt_qp.h')
| -rw-r--r-- | include/rdma/rdmavt_qp.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/rdma/rdmavt_qp.h b/include/rdma/rdmavt_qp.h index f3816396c76a..e3bb312a2ffa 100644 --- a/include/rdma/rdmavt_qp.h +++ b/include/rdma/rdmavt_qp.h @@ -2,7 +2,7 @@ #define DEF_RDMAVT_INCQP_H /* - * Copyright(c) 2016 Intel Corporation. + * Copyright(c) 2016, 2017 Intel Corporation. * * This file is provided under a dual BSD/GPLv2 license. When using or * redistributing this file, you may do so under either license. @@ -526,7 +526,6 @@ static inline void rvt_qp_wqe_reserve( struct rvt_qp *qp, struct rvt_swqe *wqe) { - wqe->wr.send_flags |= RVT_SEND_RESERVE_USED; atomic_inc(&qp->s_reserved_used); } @@ -550,7 +549,6 @@ static inline void rvt_qp_wqe_unreserve( struct rvt_swqe *wqe) { if (unlikely(wqe->wr.send_flags & RVT_SEND_RESERVE_USED)) { - wqe->wr.send_flags &= ~RVT_SEND_RESERVE_USED; atomic_dec(&qp->s_reserved_used); /* insure no compiler re-order up to s_last change */ smp_mb__after_atomic(); @@ -574,6 +572,7 @@ extern const enum ib_wc_opcode ib_rvt_wc_opcode[]; static inline void rvt_qp_swqe_complete( struct rvt_qp *qp, struct rvt_swqe *wqe, + enum ib_wc_opcode opcode, enum ib_wc_status status) { if (unlikely(wqe->wr.send_flags & RVT_SEND_RESERVE_USED)) @@ -586,7 +585,7 @@ static inline void rvt_qp_swqe_complete( memset(&wc, 0, sizeof(wc)); wc.wr_id = wqe->wr.wr_id; wc.status = status; - wc.opcode = ib_rvt_wc_opcode[wqe->wr.opcode]; + wc.opcode = opcode; wc.qp = &qp->ibqp; wc.byte_len = wqe->length; rvt_cq_enter(ibcq_to_rvtcq(qp->ibqp.send_cq), &wc, |
