Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0eb08514 authored by Eran Ben Elisha's avatar Eran Ben Elisha Committed by David S. Miller
Browse files

net/mlx4_en: Release TX QP when destroying TX ring 



TX ring QP wasn't released at mlx4_en_destroy_tx_ring. Instead, the code
used the deprecated base_tx_qpn field. Move TX QP release to
mlx4_en_destroy_tx_ring and remove the base_tx_qpn field.

Fixes: ddae0349 ('net/mlx4: Change QP allocation scheme')
Signed-off-by: default avatarEran Ben Elisha <eranbe@mellanox.com>
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent aefbef10

drivers/net/ethernet/mellanox/mlx4/en_netdev.c

+0 −4
Original line number Diff line number Diff line
@@ -1977,10 +1977,6 @@ void mlx4_en_free_resources(struct mlx4_en_priv *priv) 
			mlx4_en_destroy_cq(priv, &priv->rx_cq[i]);

	}



	if (priv->base_tx_qpn) {

		mlx4_qp_release_range(priv->mdev->dev, priv->base_tx_qpn, priv->tx_ring_num);

		priv->base_tx_qpn = 0;

	}

}



int mlx4_en_alloc_resources(struct mlx4_en_priv *priv)

drivers/net/ethernet/mellanox/mlx4/en_tx.c

+1 −0
Original line number Diff line number Diff line
@@ -180,6 +180,7 @@ 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(priv->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);

drivers/net/ethernet/mellanox/mlx4/mlx4_en.h

+0 −1
Original line number Diff line number Diff line
@@ -580,7 +580,6 @@ struct mlx4_en_priv { 
	int vids[128];

	bool wol;

	struct device *ddev;

	int base_tx_qpn;

	struct hlist_head mac_hash[MLX4_EN_MAC_HASH_SIZE];

	struct hwtstamp_config hwtstamp_config;

	u32 counter_index;