diff options
author | Yevgeny Petrilin <yevgenyp@mellanox.co.il> | 2008-12-25 21:13:20 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-25 21:13:20 -0500 |
commit | b51968d676db1c4e541b4c84de7ce7af812c9e9f (patch) | |
tree | 3d702cbcbb62df355b29074d9cf1eff662ce98e9 /drivers/net/mlx4 | |
parent | e74b3f7d568a62d21a76885438d7351948e7355a (diff) |
mlx4_en: Memory leak on completion queue free
If port is being destroyed without being activated before,
CQ resources are not freed.
Signed-off-by: Yevgeny Petrilin <yevgenyp@mellanox.co.il>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/mlx4')
-rw-r--r-- | drivers/net/mlx4/en_cq.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/mlx4/en_cq.c b/drivers/net/mlx4/en_cq.c index 1368a8010af4..1a936f4db2b7 100644 --- a/drivers/net/mlx4/en_cq.c +++ b/drivers/net/mlx4/en_cq.c | |||
@@ -68,6 +68,8 @@ int mlx4_en_create_cq(struct mlx4_en_priv *priv, | |||
68 | err = mlx4_en_map_buffer(&cq->wqres.buf); | 68 | err = mlx4_en_map_buffer(&cq->wqres.buf); |
69 | if (err) | 69 | if (err) |
70 | mlx4_free_hwq_res(mdev->dev, &cq->wqres, cq->buf_size); | 70 | mlx4_free_hwq_res(mdev->dev, &cq->wqres, cq->buf_size); |
71 | else | ||
72 | cq->buf = (struct mlx4_cqe *) cq->wqres.buf.direct.buf; | ||
71 | 73 | ||
72 | return err; | 74 | return err; |
73 | } | 75 | } |
@@ -82,7 +84,6 @@ int mlx4_en_activate_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq) | |||
82 | cq->mcq.arm_db = cq->wqres.db.db + 1; | 84 | cq->mcq.arm_db = cq->wqres.db.db + 1; |
83 | *cq->mcq.set_ci_db = 0; | 85 | *cq->mcq.set_ci_db = 0; |
84 | *cq->mcq.arm_db = 0; | 86 | *cq->mcq.arm_db = 0; |
85 | cq->buf = (struct mlx4_cqe *) cq->wqres.buf.direct.buf; | ||
86 | memset(cq->buf, 0, cq->buf_size); | 87 | memset(cq->buf, 0, cq->buf_size); |
87 | 88 | ||
88 | err = mlx4_cq_alloc(mdev->dev, cq->size, &cq->wqres.mtt, &mdev->priv_uar, | 89 | err = mlx4_cq_alloc(mdev->dev, cq->size, &cq->wqres.mtt, &mdev->priv_uar, |