diff options
| author | Eli Cohen <eli@dev.mellanox.co.il> | 2013-10-31 15:26:34 +0200 |
|---|---|---|
| committer | Roland Dreier <roland@purestorage.com> | 2013-11-15 14:36:36 -0800 |
| commit | 79d3da9c51a5fef672b329b8d8583a089d147bef (patch) | |
| tree | 6d19ba728b69f7a49a008abac9c0081c97ff5402 /drivers/infiniband | |
| parent | 2b136d025348774633a2f6fc2a87f0cf409a3ab9 (diff) | |
| download | linux-79d3da9c51a5fef672b329b8d8583a089d147bef.tar.gz | |
IB/mlx4: Fix device max capabilities check
Move the check on max supported CQEs after the final number of entries is evaluated. Signed-off-by: Eli Cohen <eli@mellanox.com> Signed-off-by: Roland Dreier <roland@purestorage.com>
Diffstat (limited to 'drivers/infiniband')
| -rw-r--r-- | drivers/infiniband/hw/mlx4/cq.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mlx4/cq.c b/drivers/infiniband/hw/mlx4/cq.c index d5e60f44ba5a..ea299515ecb2 100644 --- a/drivers/infiniband/hw/mlx4/cq.c +++ b/drivers/infiniband/hw/mlx4/cq.c @@ -365,7 +365,7 @@ int mlx4_ib_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata) mutex_lock(&cq->resize_mutex); - if (entries < 1 || entries > dev->dev->caps.max_cqes) { + if (entries < 1) { err = -EINVAL; goto out; } @@ -376,6 +376,11 @@ int mlx4_ib_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata) goto out; } + if (entries > dev->dev->caps.max_cqes) { + err = -EINVAL; + goto out; + } + if (ibcq->uobject) { err = mlx4_alloc_resize_umem(dev, cq, entries, udata); if (err) |