diff options
| author | Yevgeny Petrilin <yevgenyp@mellanox.co.il> | 2009-05-24 03:17:11 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-25 00:35:53 -0700 |
| commit | 38aab07c14adbf3c7257793d764a91923341e96a (patch) | |
| tree | ac27575621410056b4ec970db6b233a50600d15b /drivers/net/mlx4/en_cq.c | |
| parent | 8e29291650ee53a8609d9cc3a303dcbe9aa9b542 (diff) | |
| download | kernel_goldelico_gta04-38aab07c14adbf3c7257793d764a91923341e96a.zip kernel_goldelico_gta04-38aab07c14adbf3c7257793d764a91923341e96a.tar.gz kernel_goldelico_gta04-38aab07c14adbf3c7257793d764a91923341e96a.tar.bz2 | |
mlx4_en: Fix partial rings feature
In case of allocation failure, the actual ring size is rounded down to
nearest power of 2. The remaining descriptors are freed.
The CQ and SRQ are allocated with the actual size and the mask is updated.
Signed-off-by: Yevgeny Petrilin <yevgenyp@mellanox.co.il>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/mlx4/en_cq.c')
| -rw-r--r-- | drivers/net/mlx4/en_cq.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/mlx4/en_cq.c b/drivers/net/mlx4/en_cq.c index a276125..21786ad 100644 --- a/drivers/net/mlx4/en_cq.c +++ b/drivers/net/mlx4/en_cq.c @@ -89,6 +89,9 @@ int mlx4_en_activate_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq) *cq->mcq.arm_db = 0; memset(cq->buf, 0, cq->buf_size); + if (!cq->is_tx) + cq->size = priv->rx_ring[cq->ring].actual_size; + err = mlx4_cq_alloc(mdev->dev, cq->size, &cq->wqres.mtt, &mdev->priv_uar, cq->wqres.db.dma, &cq->mcq, cq->vector, cq->is_tx); if (err) |