diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-08 20:18:44 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-08 20:18:44 -0800 |
| commit | 5367f2d67c7d0bf1faae90e6e7b4e2ac3c9b5e0f (patch) | |
| tree | cb2d487774571ec608bcf4241ec70fc19a0b3ad6 /drivers/infiniband/hw/mthca/mthca_srq.c | |
| parent | 64ca9004b819ab87648dbfc78f3ef49ee491343e (diff) | |
| parent | 4f8448dfe8d3804fadad90c9b77494238b4a4eae (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
Diffstat (limited to 'drivers/infiniband/hw/mthca/mthca_srq.c')
| -rw-r--r-- | drivers/infiniband/hw/mthca/mthca_srq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mthca/mthca_srq.c b/drivers/infiniband/hw/mthca/mthca_srq.c index f7d234295ef..e7e153d9c4c 100644 --- a/drivers/infiniband/hw/mthca/mthca_srq.c +++ b/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); |