Commit 458ed666 authored Oct 17, 2016 by Ira Weiny Committed by Doug Ledford Nov 15, 2016

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: 08279d5c ("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>

parent f0f98f74

drivers/infiniband/hw/hfi1/rc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}