summaryrefslogtreecommitdiff
path: root/drivers/infiniband/hw
diff options
context:
space:
mode:
authorMike Marciniszyn <mike.marciniszyn@intel.com>2016-02-04 10:59:36 -0800
committerDoug Ledford <dledford@redhat.com>2016-03-10 20:38:03 -0500
commit08279d5c9424afd710c90d0b6df95612d2bb5a3f (patch)
tree6c92f773d77a6570e395cb47b5f98ddbae506f2d /drivers/infiniband/hw
parent3c9d149bdc797a7dfb48bcf327f9ceeb6060a512 (diff)
staging/rdma/hfi1: use new RNR timer
Use the new RNR timer for hfi1. For qib, this timer doesn't exist, so exploit driver callbacks to use the new timer as appropriate. Reviewed-by: Jubin John <jubin.john@intel.com> Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com> Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/hw')
-rw-r--r--drivers/infiniband/hw/qib/qib_qp.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/infiniband/hw/qib/qib_qp.c b/drivers/infiniband/hw/qib/qib_qp.c
index 45bed5f2bba4..787116f59395 100644
--- a/drivers/infiniband/hw/qib/qib_qp.c
+++ b/drivers/infiniband/hw/qib/qib_qp.c
@@ -412,6 +412,7 @@ void stop_send_queue(struct rvt_qp *qp)
struct qib_qp_priv *priv = qp->priv;
cancel_work_sync(&priv->s_work);
+ del_timer_sync(&qp->s_timer);
}
void quiesce_qp(struct rvt_qp *qp)