From 95bee72689337a85ae47a40008637ec95599c382 Mon Sep 17 00:00:00 2001 From: Eli Cohen Date: Mon, 4 Feb 2008 20:20:44 -0800 Subject: [PATCH] --- yaml --- r: 83247 b: refs/heads/master c: 1203c42e7be1aa0be641b701f42b6d38c2d94b39 h: refs/heads/master i: 83245: 7b3aa31a6e8a12d0f3a0f355a50946f17b527670 83243: 84fb6382f3301411af056cb4582a73615f230708 83239: b4c6febc67deb18a2f293c72e0b349a54036c4d9 83231: 416732f3aab06828db0e754c96fd20dd42ada8a9 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/mthca/mthca_srq.c | 26 +++---------------- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/[refs] b/[refs] index efa8822fd249..e917b672723d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1d96354e617990799b1cb5d7ff8f7c467b8767c8 +refs/heads/master: 1203c42e7be1aa0be641b701f42b6d38c2d94b39 diff --git a/trunk/drivers/infiniband/hw/mthca/mthca_srq.c b/trunk/drivers/infiniband/hw/mthca/mthca_srq.c index 553d681f6813..ec63adc1099c 100644 --- a/trunk/drivers/infiniband/hw/mthca/mthca_srq.c +++ b/trunk/drivers/infiniband/hw/mthca/mthca_srq.c @@ -475,11 +475,7 @@ void mthca_free_srq_wqe(struct mthca_srq *srq, u32 wqe_addr) spin_lock(&srq->lock); - if (likely(srq->first_free >= 0)) - *wqe_to_link(get_wqe(srq, srq->last_free)) = ind; - else - srq->first_free = ind; - + *wqe_to_link(get_wqe(srq, srq->last_free)) = ind; *wqe_to_link(get_wqe(srq, ind)) = -1; srq->last_free = ind; @@ -506,15 +502,7 @@ int mthca_tavor_post_srq_recv(struct ib_srq *ibsrq, struct ib_recv_wr *wr, first_ind = srq->first_free; for (nreq = 0; wr; wr = wr->next) { - ind = srq->first_free; - - if (unlikely(ind < 0)) { - mthca_err(dev, "SRQ %06x full\n", srq->srqn); - err = -ENOMEM; - *bad_wr = wr; - break; - } - + ind = srq->first_free; wqe = get_wqe(srq, ind); next_ind = *wqe_to_link(wqe); @@ -614,15 +602,7 @@ int mthca_arbel_post_srq_recv(struct ib_srq *ibsrq, struct ib_recv_wr *wr, spin_lock_irqsave(&srq->lock, flags); for (nreq = 0; wr; ++nreq, wr = wr->next) { - ind = srq->first_free; - - if (unlikely(ind < 0)) { - mthca_err(dev, "SRQ %06x full\n", srq->srqn); - err = -ENOMEM; - *bad_wr = wr; - break; - } - + ind = srq->first_free; wqe = get_wqe(srq, ind); next_ind = *wqe_to_link(wqe);