---

yaml --- r: 17063 b: refs/heads/master c: 1d7d2f6 h: refs/heads/master i: 17061: 4c05432 17059: cd383ab 17055: 4e606d0 v: v3
git-mirror · Jan 4, 2006 · 3128a56 · 3128a56
1 parent 7ecf9a7
commit 3128a56
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);