libmlx4: Fix bug in mlx4_set_sq_sizes()

Commit Message

Eli Cohen Sept. 29, 2010, 10:09 a.m. UTC

None

Patch

diff --git a/src/mlx4.h b/src/mlx4.h
index 5223697..0d03e8e 100644
--- a/src/mlx4.h
+++ b/src/mlx4.h
@@ -367,4 +367,6 @@  int mlx4_alloc_av(struct mlx4_pd *pd, struct ibv_ah_attr *attr,
 		   struct mlx4_ah *ah);
 void mlx4_free_av(struct mlx4_ah *ah);
 
+#define min(a, b) (a < b ? a : b)
+
 #endif /* MLX4_H */
diff --git a/src/qp.c b/src/qp.c
index 6ceb3ef..b70c54a 100644
--- a/src/qp.c
+++ b/src/qp.c
@@ -622,7 +622,8 @@  void mlx4_set_sq_sizes(struct mlx4_qp *qp, struct ibv_qp_cap *cap,
 {
 	int wqe_size;
 
-	wqe_size = (1 << qp->sq.wqe_shift) - sizeof (struct mlx4_wqe_ctrl_seg);
+	wqe_size = min((1 << qp->sq.wqe_shift), MLX4_MAX_WQE_SIZE) -
+		sizeof (struct mlx4_wqe_ctrl_seg);
 	switch (type) {
 	case IBV_QPT_UD:
 		wqe_size -= sizeof (struct mlx4_wqe_datagram_seg);