aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoland Dreier <rolandd@cisco.com>2007-06-12 13:52:02 -0400
committerRoland Dreier <rolandd@cisco.com>2007-06-12 13:52:02 -0400
commit42c059ea2b0aac5f961253ba81c1b464d181a600 (patch)
tree44784011ab1fde7212855b07d97926bd6d2a2cae
parent614c3c85b5b4c3776439d464939c123cce679dee (diff)
IB/mlx4: Fix warning in rounding up queue sizes
Doing max(1, foo) where foo is u32 generates a warning, because 1 is a signed constant. Fix this by using 1U instead. Signed-off-by: Roland Dreier <rolandd@cisco.com>
-rw-r--r--drivers/infiniband/hw/mlx4/qp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c
index 5c6d05427a0f..4c15fa3426b8 100644
--- a/drivers/infiniband/hw/mlx4/qp.c
+++ b/drivers/infiniband/hw/mlx4/qp.c
@@ -207,8 +207,8 @@ static int set_rq_size(struct mlx4_ib_dev *dev, struct ib_qp_cap *cap,
207 if (is_user && (!cap->max_recv_wr || !cap->max_recv_sge)) 207 if (is_user && (!cap->max_recv_wr || !cap->max_recv_sge))
208 return -EINVAL; 208 return -EINVAL;
209 209
210 qp->rq.max = roundup_pow_of_two(max(1, cap->max_recv_wr)); 210 qp->rq.max = roundup_pow_of_two(max(1U, cap->max_recv_wr));
211 qp->rq.max_gs = roundup_pow_of_two(max(1, cap->max_recv_sge)); 211 qp->rq.max_gs = roundup_pow_of_two(max(1U, cap->max_recv_sge));
212 qp->rq.wqe_shift = ilog2(qp->rq.max_gs * sizeof (struct mlx4_wqe_data_seg)); 212 qp->rq.wqe_shift = ilog2(qp->rq.max_gs * sizeof (struct mlx4_wqe_data_seg));
213 } 213 }
214 214