]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
net/mlx4_en: Fix double-release-range in tx-rings
authorJack Morgenstein <jackm@dev.mellanox.co.il>
Thu, 25 Oct 2012 01:12:47 +0000 (01:12 +0000)
committerDavid S. Miller <davem@davemloft.net>
Fri, 26 Oct 2012 07:34:15 +0000 (03:34 -0400)
The QP range is reserved as a single block. However, when freeing the
en resources, the tx-ring QPs are released both in mlx4_en_destroy_tx_ring
(one at a time) and in mlx4_en_free_resources (as a block release).

Fix by eliminating the one-at-a-time release in mlx4_en_destroy_tx_ring.

Signed-off-by: Jack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/mellanox/mlx4/en_tx.c

index c10e3a6de09f042a02be933d8aa1ca928207fe6d..0a51095fd8d6db76fed09d138e05d12ff1c68ddc 100644 (file)
@@ -143,7 +143,6 @@ void mlx4_en_destroy_tx_ring(struct mlx4_en_priv *priv,
                mlx4_bf_free(mdev->dev, &ring->bf);
        mlx4_qp_remove(mdev->dev, &ring->qp);
        mlx4_qp_free(mdev->dev, &ring->qp);
-       mlx4_qp_release_range(mdev->dev, ring->qpn, 1);
        mlx4_en_unmap_buffer(&ring->wqres.buf);
        mlx4_free_hwq_res(mdev->dev, &ring->wqres, ring->buf_size);
        kfree(ring->bounce_buf);