diff options
| author | Eran Ben Elisha <eranbe@mellanox.com> | 2019-02-19 15:26:04 +0200 |
|---|---|---|
| committer | Saeed Mahameed <saeedm@mellanox.com> | 2019-02-22 13:38:24 -0800 |
| commit | 2c493ae03a24db7117c812c5fd0adc90c19cc833 (patch) | |
| tree | 9578de175a6377cccc12ddad8b8dd0b99d963d95 /drivers/net/ethernet/mellanox/mlx5/core/en_main.c | |
| parent | 772ac5e284c7cee1f377f01fcc3e88cc5dc9fb12 (diff) | |
net/mlx5e: Re-add support for TX timeout when TX reporter is not valid
When TX reporter was introduced, it took ownership over TX timeout error
handling. this introduced a regression in case TX reporter is not valid
(NET_DEVLINK is not set, or devlink_health_reporter_create failure).
Fix mlx5e_tx_reporter_timeout function so it can be called at all times.
In addition, remove a warning print that indicates that a TX timeout won't
be handled in case of no valid TX reporter.
Fixes: 7d91126b1aea ("net/mlx5e: Add tx timeout support for mlx5e tx reporter")
Signed-off-by: Eran Ben Elisha <eranbe@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx5/core/en_main.c')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c index 878b3467e459..4f971f3d8ce7 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c @@ -4173,12 +4173,6 @@ static void mlx5e_tx_timeout(struct net_device *dev) struct mlx5e_priv *priv = netdev_priv(dev); netdev_err(dev, "TX timeout detected\n"); - - if (IS_ERR_OR_NULL(priv->tx_reporter)) { - netdev_err_once(priv->netdev, "tx timeout will not be handled, no valid tx reporter\n"); - return; - } - queue_work(priv->wq, &priv->tx_timeout_work); } |