diff options
| author |   Ira Weiny <ira.weiny@intel.com> | 2016-10-17 04:20:09 -0700 |
|---|---|---|
| committer |   Doug Ledford <dledford@redhat.com> | 2016-11-15 16:16:44 -0500 |
| commit | 458ed666fe14a54dfb6690a1a7f541782d1342c9 (patch) | |
| tree | 4b962cbefd213f1859fc531a4d446dac2eb8fbca | |
| parent | IB/hfi1: Delete unused lock (diff) | |
| download | linux-dev-458ed666fe14a54dfb6690a1a7f541782d1342c9.tar.xz linux-dev-458ed666fe14a54dfb6690a1a7f541782d1342c9.zip | |
IB/hfi1: Fix rnr_timer addition
The new s_rnr_timeout was not properly being set and the code was
incorrectly setting a different timer.
Found by code inspection.
Cc: <stable@vger.kernel.org> # 4.7.x
Fixes: 08279d5c9424 ("staging/rdma/hfi1: use new RNR timer")
Reviewed-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
| -rw-r--r-- | drivers/infiniband/hw/hfi1/rc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/hfi1/rc.c b/drivers/infiniband/hw/hfi1/rc.c index 8bc5013f39a1..83198a8a8797 100644 --- a/drivers/infiniband/hw/hfi1/rc.c +++ b/drivers/infiniband/hw/hfi1/rc.c @@ -89,7 +89,7 @@ void hfi1_add_rnr_timer(struct rvt_qp *qp, u32 to) lockdep_assert_held(&qp->s_lock); qp->s_flags |= RVT_S_WAIT_RNR; - qp->s_timer.expires = jiffies + usecs_to_jiffies(to); + priv->s_rnr_timer.expires = jiffies + usecs_to_jiffies(to); add_timer(&priv->s_rnr_timer); } |