From 3128a5653380792f766e11d84d4843071e0725e7 Mon Sep 17 00:00:00 2001 From: Jack Morgenstein Date: Wed, 4 Jan 2006 14:42:39 -0800 Subject: [PATCH] --- yaml --- r: 17063 b: refs/heads/master c: 1d7d2f6f476cf7aa65f9f740a6c932fb75608110 h: refs/heads/master i: 17061: 4c05432aef24c1465cd479e0e8ebc3c083d8a3c8 17059: cd383ab87aa5074a9423de10e76ffc1be6823961 17055: 4e606d00a5ea13cceba7e4bd2f370b615c85943c v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/mthca/mthca_srq.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 068a080e9e40..b0ea04d3caf4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c4342d8a4d95e18b957b898dbf5bfce28fca2780 +refs/heads/master: 1d7d2f6f476cf7aa65f9f740a6c932fb75608110 diff --git a/trunk/drivers/infiniband/hw/mthca/mthca_srq.c b/trunk/drivers/infiniband/hw/mthca/mthca_srq.c index f7d234295efe..e7e153d9c4c6 100644 --- a/trunk/drivers/infiniband/hw/mthca/mthca_srq.c +++ b/trunk/drivers/infiniband/hw/mthca/mthca_srq.c @@ -201,7 +201,7 @@ int mthca_alloc_srq(struct mthca_dev *dev, struct mthca_pd *pd, if (mthca_is_memfree(dev)) srq->max = roundup_pow_of_two(srq->max + 1); - ds = min(64UL, + ds = max(64UL, roundup_pow_of_two(sizeof (struct mthca_next_seg) + srq->max_gs * sizeof (struct mthca_data_seg))); srq->wqe_shift = long_log2(ds);