leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IB/mlx4: Fix device max capabilities check

Browse Source 
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>
This commit is contained in:
Eli Cohen 2013-10-31 15:26:34 +02:00 committed by Roland Dreier
parent 2b136d0253
commit 79d3da9c51
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/infiniband/hw/mlx4/cq.c
View File

@ -365,7 +365,7 @@ int mlx4_ib_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
mutex_lock(&cq->resize_mutex); mutex_lock(&cq->resize_mutex);
if (entries < 1 || entries > dev->dev->caps.max_cqes) { if (entries < 1) {
err = -EINVAL; err = -EINVAL;
goto out; goto out;
} }
@ -376,6 +376,11 @@ int mlx4_ib_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
goto out; goto out;
} }
if (entries > dev->dev->caps.max_cqes) {
err = -EINVAL;
goto out;
}
if (ibcq->uobject) { if (ibcq->uobject) {
err = mlx4_alloc_resize_umem(dev, cq, entries, udata); err = mlx4_alloc_resize_umem(dev, cq, entries, udata);
if (err) if (err)