leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IB/rdmavt: No need to cancel RNRNAK retry timer when it is running

Browse Source 
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 <mike.marciniszyn@intel.com>
Signed-off-by: Kaike Wan <kaike.wan@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
This commit is contained in:
Kaike Wan 2017-12-18 19:56:30 -08:00 committed by Doug Ledford
parent 02ee9da347
commit 437ff786e2
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/infiniband/sw/rdmavt/qp.c
View File

@ -2110,10 +2110,8 @@ static int rvt_stop_rnr_timer(struct rvt_qp *qp)
lockdep_assert_held(&qp->s_lock); lockdep_assert_held(&qp->s_lock);
/* Remove QP from rnr timer */ /* 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; qp->s_flags &= ~RVT_S_WAIT_RNR;
rval = hrtimer_try_to_cancel(&qp->s_rnr_timer);
}
return rval; return rval;
} }