diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-07-29 00:28:36 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-07-29 00:28:36 -0400 |
| commit | 572e432e01c1f7c64ad8375a6e0d935b0e40ebf5 (patch) | |
| tree | 57ae4168e9bf4c88a1267f4ec6c96df3789cc9cc /drivers/infiniband/hw/mthca/mthca_srq.c | |
| parent | d11ea48aab3b57cc931cc7120603e1c2ffb04302 (diff) | |
| parent | e3f2ddeac718c768fdac4b7fe69d465172f788a8 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/infiniband/hw/mthca/mthca_srq.c')
| -rw-r--r-- | drivers/infiniband/hw/mthca/mthca_srq.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mthca/mthca_srq.c b/drivers/infiniband/hw/mthca/mthca_srq.c index fab417c5cf4..b60a9d79ae5 100644 --- a/drivers/infiniband/hw/mthca/mthca_srq.c +++ b/drivers/infiniband/hw/mthca/mthca_srq.c @@ -370,7 +370,8 @@ int mthca_modify_srq(struct ib_srq *ibsrq, struct ib_srq_attr *attr, return -EINVAL; if (attr_mask & IB_SRQ_LIMIT) { - if (attr->srq_limit > srq->max) + u32 max_wr = mthca_is_memfree(dev) ? srq->max - 1 : srq->max; + if (attr->srq_limit > max_wr) return -EINVAL; mutex_lock(&srq->mutex); |