X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=drivers%2Finfiniband%2Fhw%2Fipath%2Fipath_verbs.c;fp=drivers%2Finfiniband%2Fhw%2Fipath%2Fipath_verbs.c;h=22bb42dc8f7382638bf2a0e2f3a6704cef94cbe7;hb=53dc1ca194c062aa9771e194047f27ec1ca592df;hp=5015cd2e57bd446c7c508ad22380a3f61c86ef52;hpb=dd37818dbdf8e51d0288c0197c351c005ffcdbdb;p=safe%2Fjmp%2Flinux-2.6 diff --git a/drivers/infiniband/hw/ipath/ipath_verbs.c b/drivers/infiniband/hw/ipath/ipath_verbs.c index 5015cd2..22bb42d 100644 --- a/drivers/infiniband/hw/ipath/ipath_verbs.c +++ b/drivers/infiniband/hw/ipath/ipath_verbs.c @@ -744,12 +744,10 @@ static void ipath_ib_timer(struct ipath_ibdev *dev) /* XXX What if timer fires again while this is running? */ for (qp = resend; qp != NULL; qp = qp->timer_next) { - struct ib_wc wc; - spin_lock_irqsave(&qp->s_lock, flags); if (qp->s_last != qp->s_tail && qp->state == IB_QPS_RTS) { dev->n_timeouts++; - ipath_restart_rc(qp, qp->s_last_psn + 1, &wc); + ipath_restart_rc(qp, qp->s_last_psn + 1); } spin_unlock_irqrestore(&qp->s_lock, flags);