diff options
| author | Doug Ledford <dledford@redhat.com> | 2016-04-28 21:16:32 +0200 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2016-04-28 21:16:32 +0200 |
| commit | e29bff46b9b8663e1789fbcd65d0ba05a52f08af (patch) | |
| tree | cce17191cf20c60dc917c62f01d96f6b571a47d4 /drivers/infiniband/hw/mlx5 | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval... (diff) | |
| parent | IB/security: Restrict use of the write() interface (diff) | |
| download | linux-e29bff46b9b8663e1789fbcd65d0ba05a52f08af.tar.xz linux-e29bff46b9b8663e1789fbcd65d0ba05a52f08af.zip | |
Merge branch 'k.o/for-4.6-rc' into testing/4.6
Diffstat (limited to 'drivers/infiniband/hw/mlx5')
| -rw-r--r-- | drivers/infiniband/hw/mlx5/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c index 99eb1c1a3b7b..6ad0489cb3c5 100644 --- a/drivers/infiniband/hw/mlx5/main.c +++ b/drivers/infiniband/hw/mlx5/main.c @@ -530,7 +530,7 @@ static int mlx5_ib_query_device(struct ib_device *ibdev, sizeof(struct mlx5_wqe_ctrl_seg)) / sizeof(struct mlx5_wqe_data_seg); props->max_sge = min(max_rq_sg, max_sq_sg); - props->max_sge_rd = props->max_sge; + props->max_sge_rd = MLX5_MAX_SGE_RD; props->max_cq = 1 << MLX5_CAP_GEN(mdev, log_max_cq); props->max_cqe = (1 << MLX5_CAP_GEN(mdev, log_max_cq_sz)) - 1; props->max_mr = 1 << MLX5_CAP_GEN(mdev, log_max_mkey); |