diff options
| author | Ira Weiny <ira.weiny@intel.com> | 2016-10-17 04:20:09 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-11-26 09:56:54 +0100 |
| commit | 8b4d44f46bf22c7b77fdc91ed668c50261f9b536 (patch) | |
| tree | 271eb24e3328d016e44601af66ba88198556612a /drivers/infiniband/hw/hfi1/rc.c | |
| parent | 06eac15f11e014e471f1486fa47817d3a3697b4d (diff) | |
| download | lwn-8b4d44f46bf22c7b77fdc91ed668c50261f9b536.tar.gz lwn-8b4d44f46bf22c7b77fdc91ed668c50261f9b536.zip | |
IB/hfi1: Fix rnr_timer addition
commit 458ed666fe14a54dfb6690a1a7f541782d1342c9 upstream.
The new s_rnr_timeout was not properly being set and the code was
incorrectly setting a different timer.
Found by code inspection.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/infiniband/hw/hfi1/rc.c')
| -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 bcf76c33726b..e3629983f1bf 100644 --- a/drivers/infiniband/hw/hfi1/rc.c +++ b/drivers/infiniband/hw/hfi1/rc.c @@ -87,7 +87,7 @@ void hfi1_add_rnr_timer(struct rvt_qp *qp, u32 to) struct hfi1_qp_priv *priv = qp->priv; 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); } |