Commit 60b1809f authored by Yevgeny Petrilin's avatar Yevgeny Petrilin Committed by David S. Miller
Browse files

mlx4_en: Restoring RX buffer pointer in case of failure 



If not done, second attempt to open the RX ring would cause memory corruption.

Signed-off-by: default avatarYevgeny Petrilin <yevgenyp@mellanox.co.il>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ab6dc30d

drivers/net/mlx4/en_rx.c

+4 −0
Original line number Diff line number Diff line
@@ -345,6 +345,8 @@ int mlx4_en_activate_rx_rings(struct mlx4_en_priv *priv) 
		err = mlx4_en_init_allocator(priv, ring);

		if (err) {

			en_err(priv, "Failed initializing ring allocator\n");

			if (ring->stride <= TXBB_SIZE)

				ring->buf -= TXBB_SIZE;

			ring_ind--;

			goto err_allocator;

		}
@@ -369,6 +371,8 @@ err_buffers: 
	ring_ind = priv->rx_ring_num - 1;

err_allocator:

	while (ring_ind >= 0) {

		if (priv->rx_ring[ring_ind].stride <= TXBB_SIZE)

			priv->rx_ring[ring_ind].buf -= TXBB_SIZE;

		mlx4_en_destroy_allocator(priv, &priv->rx_ring[ring_ind]);

		ring_ind--;

	}