diff options
| author | Mike Marciniszyn <mike.marciniszyn@intel.com> | 2016-02-04 10:59:36 -0800 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2016-03-10 20:38:03 -0500 |
| commit | 08279d5c9424afd710c90d0b6df95612d2bb5a3f (patch) | |
| tree | 6c92f773d77a6570e395cb47b5f98ddbae506f2d /drivers/infiniband | |
| parent | 3c9d149bdc797a7dfb48bcf327f9ceeb6060a512 (diff) | |
| download | op-kernel-dev-08279d5c9424afd710c90d0b6df95612d2bb5a3f.zip op-kernel-dev-08279d5c9424afd710c90d0b6df95612d2bb5a3f.tar.gz | |
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')
| -rw-r--r-- | drivers/infiniband/hw/qib/qib_qp.c | 1 | ||||
| -rw-r--r-- | drivers/infiniband/sw/rdmavt/qp.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/qib/qib_qp.c b/drivers/infiniband/hw/qib/qib_qp.c index 45bed5f..787116f 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) diff --git a/drivers/infiniband/sw/rdmavt/qp.c b/drivers/infiniband/sw/rdmavt/qp.c index 322de64..439213c 100644 --- a/drivers/infiniband/sw/rdmavt/qp.c +++ b/drivers/infiniband/sw/rdmavt/qp.c @@ -405,7 +405,6 @@ void rvt_reset_qp(struct rvt_dev_info *rdi, struct rvt_qp *qp, /* Stop the send queue and the retry timer */ rdi->driver_f.stop_send_queue(qp); - del_timer_sync(&qp->s_timer); /* Wait for things to stop */ rdi->driver_f.quiesce_qp(qp); |
