diff options
author | Roland Dreier <rolandd@cisco.com> | 2007-06-18 11:13:53 -0400 |
---|---|---|
committer | Roland Dreier <rolandd@cisco.com> | 2007-06-18 11:13:53 -0400 |
commit | 54e95f8dcbd7d86f79b423e8d11053ec9a2d9946 (patch) | |
tree | e16c04dc92d72f21e82287fb73b22907f9fcdd35 | |
parent | 0e6e74162164d908edf7889ac66dca09e7505745 (diff) |
IB/mlx4: Get rid of max_inline_data calculation
The calculation of max_inline_data in set_kernel_sq_size() is bogus,
since it doesn't take into account the fact that inline segments may
not cross a 64-byte boundary, and hence multiple inline segments will
probably need to be used to post large inline sends.
We don't support inline sends for kernel QPs anyway, so there's no
point in doing this calculation anyway, since the field is just zeroed
out a little later. So just delete the bogus calculation.
Signed-off-by: Roland Dreier <rolandd@cisco.com>
-rw-r--r-- | drivers/infiniband/hw/mlx4/qp.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c index 8fabe0da3234..95d4a9d6994c 100644 --- a/drivers/infiniband/hw/mlx4/qp.c +++ b/drivers/infiniband/hw/mlx4/qp.c | |||
@@ -277,8 +277,8 @@ static int set_kernel_sq_size(struct mlx4_ib_dev *dev, struct ib_qp_cap *cap, | |||
277 | 277 | ||
278 | cap->max_send_wr = qp->sq.max_post = qp->sq.wqe_cnt - qp->sq_spare_wqes; | 278 | cap->max_send_wr = qp->sq.max_post = qp->sq.wqe_cnt - qp->sq_spare_wqes; |
279 | cap->max_send_sge = qp->sq.max_gs; | 279 | cap->max_send_sge = qp->sq.max_gs; |
280 | cap->max_inline_data = (1 << qp->sq.wqe_shift) - send_wqe_overhead(type) - | 280 | /* We don't support inline sends for kernel QPs (yet) */ |
281 | sizeof (struct mlx4_wqe_inline_seg); | 281 | cap->max_inline_data = 0; |
282 | 282 | ||
283 | return 0; | 283 | return 0; |
284 | } | 284 | } |
@@ -390,9 +390,6 @@ static int create_qp_common(struct mlx4_ib_dev *dev, struct ib_pd *pd, | |||
390 | err = -ENOMEM; | 390 | err = -ENOMEM; |
391 | goto err_wrid; | 391 | goto err_wrid; |
392 | } | 392 | } |
393 | |||
394 | /* We don't support inline sends for kernel QPs (yet) */ | ||
395 | init_attr->cap.max_inline_data = 0; | ||
396 | } | 393 | } |
397 | 394 | ||
398 | err = mlx4_qp_alloc(dev->dev, sqpn, &qp->mqp); | 395 | err = mlx4_qp_alloc(dev->dev, sqpn, &qp->mqp); |