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]>

diff --git a/drivers/infiniband/sw/rdmavt/qp.c b/drivers/infiniband/sw/rdmavt/qp.c
index 9177df60742a3cedb0099e026d6083b13fa455fa..73705a19bd2e35d359eb8be1bee73df3a2f8a10e 100644 (file)
--- 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;
 }