diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-09-07 17:40:18 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-09-07 17:40:18 +0200 |
| commit | 22c63d9c9461b280df608f620ad2d18d984c11a9 (patch) | |
| tree | c21b1bf6b0f8c83051b41b8fa5479d24b3f8f500 /drivers/net/ethernet/mellanox/mlx5/core/en_main.c | |
| parent | tcp: ulp: fix possible crash in tcp_diag_get_aux_size() (diff) | |
| parent | net/mlx5e: Add port buffer's congestion counters (diff) | |
| download | linux-dev-22c63d9c9461b280df608f620ad2d18d984c11a9.tar.xz linux-dev-22c63d9c9461b280df608f620ad2d18d984c11a9.zip | |
Merge tag 'mlx5-updates-2019-09-05' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux
Saeed Mahameed says:
====================
mlx5-updates-2019-09-05
1) Allover mlx5 cleanups
2) Added port congestion counters to ethtool stats:
Add 3 counters per priority to ethtool using PPCNT:
2.1) rx_prio[p]_buf_discard - the number of packets discarded by device
due to lack of per host receive buffers
2.2) rx_prio[p]_cong_discard - the number of packets discarded by device
due to per host congestion
2.3) rx_prio[p]_marked - the number of packets ECN marked by device due
to per host congestion
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx5/core/en_main.c')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c index 1cacda1bc1b4..7569287f8f3c 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c @@ -1315,7 +1315,6 @@ static int mlx5e_open_txqsq(struct mlx5e_channel *c, return 0; err_free_txqsq: - clear_bit(MLX5E_SQ_STATE_ENABLED, &sq->state); mlx5e_free_txqsq(sq); return err; @@ -1403,7 +1402,6 @@ int mlx5e_open_icosq(struct mlx5e_channel *c, struct mlx5e_params *params, return 0; err_free_icosq: - clear_bit(MLX5E_SQ_STATE_ENABLED, &sq->state); mlx5e_free_icosq(sq); return err; |