diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-07-29 01:39:17 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-07-29 01:39:17 -0400 |
| commit | ab3b3fd38125be0242c2f94bf144b48054210882 (patch) | |
| tree | c668c4d6381046f59a973284ff4de59436f84944 /drivers/infiniband/hw/mthca/mthca_srq.c | |
| parent | b71426eb10d904d421b36f51f93c8d0ba558edac (diff) | |
| parent | e3f2ddeac718c768fdac4b7fe69d465172f788a8 (diff) | |
Merge branch 'master' into upstream-fixes
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 fab417c5cf43..b60a9d79ae54 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); |