From b0e82bc2bd868bd1c1151edac407d5fb2ff03c60 Mon Sep 17 00:00:00 2001 From: Jack Morgenstein Date: Mon, 20 Mar 2006 12:35:34 +0200 Subject: [PATCH] --- yaml --- r: 23771 b: refs/heads/master c: ded9ad721d220d47989177076a181ae1f1b93af5 h: refs/heads/master i: 23769: 27b4eae714af8b41ef5fb462c45fb9d6c9114101 23767: cc24980ce508cd1dd25986c3aba35f9e625fe151 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/mthca/mthca_srq.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 5c1a6a3daa89..d1f5d1b1634a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0ef61db837c93d4377fabd37182bb6f83ea5ca70 +refs/heads/master: ded9ad721d220d47989177076a181ae1f1b93af5 diff --git a/trunk/drivers/infiniband/hw/mthca/mthca_srq.c b/trunk/drivers/infiniband/hw/mthca/mthca_srq.c index 47a6a754a591..4e671e00e42b 100644 --- a/trunk/drivers/infiniband/hw/mthca/mthca_srq.c +++ b/trunk/drivers/infiniband/hw/mthca/mthca_srq.c @@ -205,6 +205,10 @@ int mthca_alloc_srq(struct mthca_dev *dev, struct mthca_pd *pd, ds = max(64UL, roundup_pow_of_two(sizeof (struct mthca_next_seg) + srq->max_gs * sizeof (struct mthca_data_seg))); + + if (ds > dev->limits.max_desc_sz) + return -EINVAL; + srq->wqe_shift = long_log2(ds); srq->srqn = mthca_alloc(&dev->srq_table.alloc);