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

Commit b477ba62 authored by Eugenia Emantayev's avatar Eugenia Emantayev Committed by David S. Miller
Browse files

mlx4_en: clear all eth statistics when port goes up 



Bug fix: Not all stats fields were cleared.

Signed-off-by: default avatarEugenia Emantayev <eugenia@mellanox.co.il>
Reviewed-by: default avatarYevgeny Petriln <yevgenyp@mellanox.co.il>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5a45f008

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

+24 −12
Original line number Diff line number Diff line
@@ -807,37 +807,49 @@ static void mlx4_en_restart(struct work_struct *work) 
	mutex_unlock(&mdev->state_lock);

}





static int mlx4_en_open(struct net_device *dev)

static void mlx4_en_clear_stats(struct net_device *dev)

{

	struct mlx4_en_priv *priv = netdev_priv(dev);

	struct mlx4_en_dev *mdev = priv->mdev;

	int i;

	int err = 0;



	mutex_lock(&mdev->state_lock);



	if (!mdev->device_up) {

		en_err(priv, "Cannot open - device down/disabled\n");

		err = -EBUSY;

		goto out;

	}



	/* Reset HW statistics and performance counters */

	if (mlx4_en_DUMP_ETH_STATS(mdev, priv->port, 1))

		en_dbg(HW, priv, "Failed dumping statistics\n");



	memset(&priv->stats, 0, sizeof(priv->stats));

	memset(&priv->pstats, 0, sizeof(priv->pstats));

	memset(&priv->pkstats, 0, sizeof(priv->pkstats));

	memset(&priv->port_stats, 0, sizeof(priv->port_stats));



	for (i = 0; i < priv->tx_ring_num; i++) {

		priv->tx_ring[i].bytes = 0;

		priv->tx_ring[i].packets = 0;

		priv->tx_ring[i].tx_csum = 0;

	}

	for (i = 0; i < priv->rx_ring_num; i++) {

		priv->rx_ring[i].bytes = 0;

		priv->rx_ring[i].packets = 0;

		priv->rx_ring[i].csum_ok = 0;

		priv->rx_ring[i].csum_none = 0;

	}

}



static int mlx4_en_open(struct net_device *dev)

{

	struct mlx4_en_priv *priv = netdev_priv(dev);

	struct mlx4_en_dev *mdev = priv->mdev;

	int err = 0;



	mutex_lock(&mdev->state_lock);



	if (!mdev->device_up) {

		en_err(priv, "Cannot open - device down/disabled\n");

		err = -EBUSY;

		goto out;

	}



	/* Reset HW statistics and SW counters */

	mlx4_en_clear_stats(dev);



	err = mlx4_en_start_port(dev);

	if (err)