diff options
| author |   Brian Welty <brian.welty@intel.com> | 2017-02-08 05:27:01 -0800 |
|---|---|---|
| committer |   Doug Ledford <dledford@redhat.com> | 2017-02-19 09:18:38 -0500 |
| commit | beb5a0426794c9698c4e0349c626d819b5f3b2c7 (patch) | |
| tree | 3cf59b368175686881cda84bf44119e9681afd84 /drivers/infiniband/hw/qib/qib_uc.c | |
| parent | IB/hfi1: Check upper-case EFI variables (diff) | |
| download | linux-dev-beb5a0426794c9698c4e0349c626d819b5f3b2c7.tar.xz linux-dev-beb5a0426794c9698c4e0349c626d819b5f3b2c7.zip | |
IB/hfi1, qib, rdmavt: Move two IB event functions into rdmavt
Add rvt_rc_error() and rvt_comm_est() as shared functions in
rdmavt, moved from hfi1/qib logic.
Reviewed-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Brian Welty <brian.welty@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/hw/qib/qib_uc.c')
| -rw-r--r-- | drivers/infiniband/hw/qib/qib_uc.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/drivers/infiniband/hw/qib/qib_uc.c b/drivers/infiniband/hw/qib/qib_uc.c index 5b2d483451ad..b337b60fc40d 100644 --- a/drivers/infiniband/hw/qib/qib_uc.c +++ b/drivers/infiniband/hw/qib/qib_uc.c @@ -325,17 +325,8 @@ inv: goto inv; } - if (qp->state == IB_QPS_RTR && !(qp->r_flags & RVT_R_COMM_EST)) { - qp->r_flags |= RVT_R_COMM_EST; - if (qp->ibqp.event_handler) { - struct ib_event ev; - - ev.device = qp->ibqp.device; - ev.element.qp = &qp->ibqp; - ev.event = IB_EVENT_COMM_EST; - qp->ibqp.event_handler(&ev, qp->ibqp.qp_context); - } - } + if (qp->state == IB_QPS_RTR && !(qp->r_flags & RVT_R_COMM_EST)) + rvt_comm_est(qp); /* OK, process the packet. */ switch (opcode) { @@ -527,7 +518,7 @@ drop: return; op_err: - qib_rc_error(qp, IB_WC_LOC_QP_OP_ERR); + rvt_rc_error(qp, IB_WC_LOC_QP_OP_ERR); return; } |