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

Commit 1ec4864b authored by Amir Vadai's avatar Amir Vadai Committed by David S. Miller
Browse files

net/mlx4_en: Fixed crash when port type is changed 



timecounter_init() was was called only after first potential
timecounter_read().
Moved mlx4_en_init_timestamp() before mlx4_en_init_netdev()

Signed-off-by: default avatarAmir Vadai <amirv@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5600090e

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

+4 −4
Original line number Diff line number Diff line
@@ -264,6 +264,10 @@ static void *mlx4_en_add(struct mlx4_dev *dev) 
	mlx4_foreach_port(i, dev, MLX4_PORT_TYPE_ETH)

		mdev->port_cnt++;



	/* Initialize time stamp mechanism */

	if (mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_TS)

		mlx4_en_init_timestamp(mdev);



	mlx4_foreach_port(i, dev, MLX4_PORT_TYPE_ETH) {

		if (!dev->caps.comp_pool) {

			mdev->profile.prof[i].rx_ring_num =
@@ -301,10 +305,6 @@ static void *mlx4_en_add(struct mlx4_dev *dev) 
			mdev->pndev[i] = NULL;

	}



	/* Initialize time stamp mechanism */

	if (mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_TS)

		mlx4_en_init_timestamp(mdev);



	return mdev;



err_mr: