diff options
author | David S. Miller <davem@davemloft.net> | 2018-12-05 16:48:44 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-12-05 16:48:44 -0800 |
commit | ba5dfaff195557209015add52e57191899ccfca0 (patch) | |
tree | d2d87f51148334301f4b45914bcffeba687957bd /drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | |
parent | Merge branch 'u32-to-linkmode-fixes' (diff) | |
parent | net/mlx5e: Improve ethtool private-flags code structure (diff) | |
download | linux-dev-ba5dfaff195557209015add52e57191899ccfca0.tar.xz linux-dev-ba5dfaff195557209015add52e57191899ccfca0.zip |
Merge tag 'mlx5e-updates-2018-12-04' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux
Saeed Mahameed says:
====================
mlx5e-updates-2018-12-04
This series includes updates to mlx5e netdevice driver
From Saeed, Remove trailing space of tx_pause ethtool stat
From Gal, Cleanup unused defines
From Aya, ethtool Support for configuring of RX hash fields
From Tariq, Improve ethtool private-flags code structure
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx5/core/en_stats.c')
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c b/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c index 3e99d0728b2f..40b60e958cfd 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c @@ -936,7 +936,7 @@ static const struct counter_desc pport_per_prio_pfc_stats_desc[] = { }; static const struct counter_desc pport_pfc_stall_stats_desc[] = { - { "tx_pause_storm_warning_events ", PPORT_PER_PRIO_OFF(device_stall_minor_watermark_cnt) }, + { "tx_pause_storm_warning_events", PPORT_PER_PRIO_OFF(device_stall_minor_watermark_cnt) }, { "tx_pause_storm_error_events", PPORT_PER_PRIO_OFF(device_stall_critical_watermark_cnt) }, }; |