diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-02-23 13:56:25 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-02-23 13:56:25 -0800 |
| commit | f88d5d684c0289fc7970795848f2ed07ef0b1b57 (patch) | |
| tree | 0623f2fb72867b0aa78c3ac3dba0b538bc242ecb /drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | |
| parent | Merge branch 'mlxsw-Add-support-for-new-port-types-and-speeds-for-Spectrum-2' (diff) | |
| parent | net/mlx5: Support ndo bridge_setlink and getlink (diff) | |
| download | linux-dev-f88d5d684c0289fc7970795848f2ed07ef0b1b57.tar.xz linux-dev-f88d5d684c0289fc7970795848f2ed07ef0b1b57.zip | |
Merge tag 'mlx5-updates-2019-02-21' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux
Saeed Mahameed says:
====================
mlx5-updates-2019-02-21
This series adds some misc updates to mlx5 driver,
1) Eli Britstein, Introduces tunnel entropy control from PCMR register
and fixes GRE key by controlling port tunnel entropy calculation.
2) Eran Ben Elisha, provides some mlx5 fixes to the latest tx devlink health
reporting mechanism.
3) Huy Nguyen, Added the support for ndo bridge_setlink to allow
VEPA/VEB E-Switch legacy mode configurations.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx5/core/en_tx.c')
| -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 e7aae45a01f8..25a8f8260c14 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c @@ -508,9 +508,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++; } |