diff options
author | Doug Ledford <dledford@redhat.com> | 2019-07-29 13:38:42 -0400 |
---|---|---|
committer | Doug Ledford <dledford@redhat.com> | 2019-07-29 13:38:42 -0400 |
commit | 525a2c651cdd08b19a4c04f63b87e460765220ac (patch) | |
tree | ad65ead1b0a281be08e5c47e2a7eb911dd0d2a9b /drivers/infiniband/hw/hfi1/rc.c | |
parent | IB/mlx5: Support per device q counters in switchdev mode (diff) | |
parent | Do not dereference 'siw_crypto_shash' before checking (diff) | |
download | linux-dev-525a2c651cdd08b19a4c04f63b87e460765220ac.tar.xz linux-dev-525a2c651cdd08b19a4c04f63b87e460765220ac.zip |
Merge branch 'wip/dl-for-rc' into wip/dl-for-next
The fix for IB port statistics initialization ("IB/core: Fix querying
total rdma stats") is needed before we take a follow-on patch to
for-next.
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/hw/hfi1/rc.c')
-rw-r--r-- | drivers/infiniband/hw/hfi1/rc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/hfi1/rc.c b/drivers/infiniband/hw/hfi1/rc.c index 0477c14633ab..024a7c2b6124 100644 --- a/drivers/infiniband/hw/hfi1/rc.c +++ b/drivers/infiniband/hw/hfi1/rc.c @@ -1835,7 +1835,6 @@ void hfi1_rc_send_complete(struct rvt_qp *qp, struct hfi1_opa_header *opah) cmp_psn(qp->s_sending_psn, qp->s_sending_hpsn) <= 0) break; trdma_clean_swqe(qp, wqe); - rvt_qp_wqe_unreserve(qp, wqe); trace_hfi1_qp_send_completion(qp, wqe, qp->s_last); rvt_qp_complete_swqe(qp, wqe, @@ -1882,7 +1881,6 @@ struct rvt_swqe *do_rc_completion(struct rvt_qp *qp, if (cmp_psn(wqe->lpsn, qp->s_sending_psn) < 0 || cmp_psn(qp->s_sending_psn, qp->s_sending_hpsn) > 0) { trdma_clean_swqe(qp, wqe); - rvt_qp_wqe_unreserve(qp, wqe); trace_hfi1_qp_send_completion(qp, wqe, qp->s_last); rvt_qp_complete_swqe(qp, wqe, |