Merge tag 'mlx5-updates-2019-09-05' of git://git.kernel.org/pub/scm/linux/kernel...
authorDavid S. Miller <davem@davemloft.net>
Sat, 7 Sep 2019 15:40:18 +0000 (17:40 +0200)
committerDavid S. Miller <davem@davemloft.net>
Sat, 7 Sep 2019 15:40:18 +0000 (17:40 +0200)
commit22c63d9c9461b280df608f620ad2d18d984c11a9
treec21b1bf6b0f8c83051b41b8fa5479d24b3f8f500
parentb58662a5f7f4677debd5e28d10145cf5decd516b
parent1297d97f4862ad690d882ae5b0487e3d1ff15953
Merge tag 'mlx5-updates-2019-09-05' of git://git./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>
drivers/net/ethernet/mellanox/mlx5/core/en_main.c