diff options
| author | Kaike Wan <[email protected]> | 2017-12-18 19:56:30 -0800 |
|---|---|---|
| committer | Doug Ledford <[email protected]> | 2018-01-05 13:34:55 -0500 |
| commit | 437ff786e24934bb39493f9c381595e6fab6d338 (patch) | |
| tree | f2b86ea608c7471032aab8bf2d6587fa68845821 | |
| parent | 02ee9da347873699603d9ce0112a80b5dd69dea1 (diff) | |
IB/rdmavt: No need to cancel RNRNAK retry timer when it is running
When the rdmavt's RNRNAK timer is fired, it tries to cancel the timer by
calling hrtimer_try_to_cancel(), which always returns -1 because the timer
is currently running. This patch removes this useless call.
Reviewed-by: Mike Marciniszyn <[email protected]>
Signed-off-by: Kaike Wan <[email protected]>
Signed-off-by: Dennis Dalessandro <[email protected]>
Signed-off-by: Doug Ledford <[email protected]>
| -rw-r--r-- | drivers/infiniband/sw/rdmavt/qp.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/infiniband/sw/rdmavt/qp.c b/drivers/infiniband/sw/rdmavt/qp.c index 9177df60742a..73705a19bd2e 100644 --- a/drivers/infiniband/sw/rdmavt/qp.c +++ b/drivers/infiniband/sw/rdmavt/qp.c @@ -2110,10 +2110,8 @@ static int rvt_stop_rnr_timer(struct rvt_qp *qp) lockdep_assert_held(&qp->s_lock); /* Remove QP from rnr timer */ - if (qp->s_flags & RVT_S_WAIT_RNR) { + if (qp->s_flags & RVT_S_WAIT_RNR) qp->s_flags &= ~RVT_S_WAIT_RNR; - rval = hrtimer_try_to_cancel(&qp->s_rnr_timer); - } return rval; } |