diff options
| author | Doug Ledford <dledford@redhat.com> | 2016-08-25 11:17:10 -0400 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2016-08-25 11:17:10 -0400 |
| commit | 049b1e7c7e5c21bbb64dc3fc10bb0c53f30b0b70 (patch) | |
| tree | 2057681499040664e432d74ee92937897c3ac084 /drivers | |
| parent | 716b076ba4b273f5f85c97448c5110c6d21e73e6 (diff) | |
| parent | 07c72d7d54d138eb2ca37709a5a3d55fbcc01536 (diff) | |
Merge branch 'misc-fixes' into k.o/for-4.8-rc
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/infiniband/hw/i40iw/i40iw_cm.c | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/drivers/infiniband/hw/i40iw/i40iw_cm.c b/drivers/infiniband/hw/i40iw/i40iw_cm.c index 64343985e0b7..7ca0638579c0 100644 --- a/drivers/infiniband/hw/i40iw/i40iw_cm.c +++ b/drivers/infiniband/hw/i40iw/i40iw_cm.c @@ -3347,26 +3347,6 @@ int i40iw_cm_disconn(struct i40iw_qp *iwqp) } /** - * i40iw_loopback_nop - Send a nop - * @qp: associated hw qp - */ -static void i40iw_loopback_nop(struct i40iw_sc_qp *qp) -{ - u64 *wqe; - u64 header; - - wqe = qp->qp_uk.sq_base->elem; - set_64bit_val(wqe, 0, 0); - set_64bit_val(wqe, 8, 0); - set_64bit_val(wqe, 16, 0); - - header = LS_64(I40IWQP_OP_NOP, I40IWQPSQ_OPCODE) | - LS_64(0, I40IWQPSQ_SIGCOMPL) | - LS_64(qp->qp_uk.swqe_polarity, I40IWQPSQ_VALID); - set_64bit_val(wqe, 24, header); -} - -/** * i40iw_qp_disconnect - free qp and close cm * @iwqp: associate qp for the connection */ @@ -3638,7 +3618,7 @@ int i40iw_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) } else { if (iwqp->page) iwqp->sc_qp.qp_uk.sq_base = kmap(iwqp->page); - i40iw_loopback_nop(&iwqp->sc_qp); + dev->iw_priv_qp_ops->qp_send_lsmm(&iwqp->sc_qp, NULL, 0, 0); } if (iwqp->page) |