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_tx.c | |
| parent | net/mlx5e: Fix warn print in case of TX reporter creation failure (diff) | |
| download | linux-dev-2c493ae03a24db7117c812c5fd0adc90c19cc833.tar.xz linux-dev-2c493ae03a24db7117c812c5fd0adc90c19cc833.zip | |
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 '')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c index c1334a8ac8f3..d5fadbd6577e 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c @@ -519,9 +519,8 @@ bool mlx5e_poll_tx_cq(struct mlx5e_cq *cq, int napi_budget) &sq->state)) { mlx5e_dump_error_cqe(sq, (struct mlx5_err_cqe *)cqe); - if (!IS_ERR_OR_NULL(cq->channel->priv->tx_reporter)) - queue_work(cq->channel->priv->wq, - &sq->recover_work); + queue_work(cq->channel->priv->wq, + &sq->recover_work); } stats->cqe_err++; } |