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

Commit 303211b4 authored by Feras Daoud's avatar Feras Daoud Committed by Saeed Mahameed
Browse files

net/mlx5e: Always initialize update stats delayed work 



mlx5e_detach_netdev cancels update_stats work which was not initialized
in ipoib netdevice profile, as a result, the following assert occurs:

ODEBUG: assert_init not available (active state 0) object type:
timer_list hint:(null)

This change moves the update stats work to be initialized for all
mlx5e netdevices.

Fixes: cd565b4b ("IB/IPoIB: Support acceleration options callbacks")
Signed-off-by: default avatarFeras Daoud <ferasda@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 182570b2

drivers/net/ethernet/mellanox/mlx5/core/en.h

+0 −1
Original line number Diff line number Diff line
@@ -926,7 +926,6 @@ int mlx5e_create_tises(struct mlx5e_priv *priv); 
void mlx5e_cleanup_nic_tx(struct mlx5e_priv *priv);

int mlx5e_close(struct net_device *netdev);

int mlx5e_open(struct net_device *netdev);

void mlx5e_update_stats_work(struct work_struct *work);



int mlx5e_bits_invert(unsigned long a, int size);

drivers/net/ethernet/mellanox/mlx5/core/en_main.c

+3 −2
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ static void mlx5e_update_ndo_stats(struct mlx5e_priv *priv) 
			mlx5e_stats_grps[i].update_stats(priv);

}



void mlx5e_update_stats_work(struct work_struct *work)

static void mlx5e_update_stats_work(struct work_struct *work)

{

	struct delayed_work *dwork = to_delayed_work(work);

	struct mlx5e_priv *priv = container_of(dwork, struct mlx5e_priv,
@@ -4582,7 +4582,6 @@ static void mlx5e_build_nic_netdev_priv(struct mlx5_core_dev *mdev, 
	INIT_WORK(&priv->update_carrier_work, mlx5e_update_carrier_work);

	INIT_WORK(&priv->set_rx_mode_work, mlx5e_set_rx_mode_work);

	INIT_WORK(&priv->tx_timeout_work, mlx5e_tx_timeout_work);

	INIT_DELAYED_WORK(&priv->update_stats_work, mlx5e_update_stats_work);



	mlx5e_timestamp_init(priv);

}
@@ -4955,6 +4954,8 @@ int mlx5e_netdev_init(struct net_device *netdev, struct mlx5e_priv *priv) 
{

	netif_carrier_off(netdev);



	INIT_DELAYED_WORK(&priv->update_stats_work, mlx5e_update_stats_work);



	priv->wq = create_singlethread_workqueue("mlx5e");

	if (!priv->wq)

		return -ENOMEM;

drivers/net/ethernet/mellanox/mlx5/core/en_rep.c

+0 −2
Original line number Diff line number Diff line
@@ -1095,8 +1095,6 @@ static int mlx5e_init_rep(struct mlx5_core_dev *mdev, 
	if (err)

		return err;



	INIT_DELAYED_WORK(&priv->update_stats_work, mlx5e_update_stats_work);



	mutex_init(&priv->state_lock);



	priv->channels.params.num_channels = profile->max_nch(mdev);