diff options
| author | David S. Miller <davem@davemloft.net> | 2015-06-24 00:42:48 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-06-24 00:42:48 -0700 |
| commit | 12d4ae9d998cf5b832b2387fc0d2b5b9efcdd322 (patch) | |
| tree | 3e1720bf504ad6dcca7d4b1166ed4bce2e76c6d1 /drivers/net/ethernet/mellanox/mlx4/mlx4_stats.h | |
| parent | 0a51f76e3c3efcd5eb740868e1096221f8d7d8e0 (diff) | |
| parent | 99611ba127cfa13ddaed51f9d3cd1765a8214dd4 (diff) | |
| download | linux-stable-12d4ae9d998cf5b832b2387fc0d2b5b9efcdd322.tar.gz linux-stable-12d4ae9d998cf5b832b2387fc0d2b5b9efcdd322.tar.bz2 linux-stable-12d4ae9d998cf5b832b2387fc0d2b5b9efcdd322.zip | |
Merge branch 'mlx-next'
Or Gerlitz says:
====================
Mellanox NIC drivers update, June 23 2015
This series has two fixes from Eran to his recent SRIOV counters work in
mlx4 and few more updates from Saeed and Achiad to the mlx5 Ethernet
code. All fixes here relate to net-next code, so no need for -stable.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx4/mlx4_stats.h')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/mlx4_stats.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4_stats.h b/drivers/net/ethernet/mellanox/mlx4/mlx4_stats.h index c5c1de9cf2ce..7fd466c0b929 100644 --- a/drivers/net/ethernet/mellanox/mlx4/mlx4_stats.h +++ b/drivers/net/ethernet/mellanox/mlx4/mlx4_stats.h @@ -79,8 +79,7 @@ struct mlx4_en_flow_stats_tx { #define NUM_FLOW_STATS (NUM_FLOW_STATS_RX + NUM_FLOW_STATS_TX + \ NUM_FLOW_PRIORITY_STATS_TX + \ - NUM_FLOW_PRIORITY_STATS_RX + \ - NUM_PF_STATS) + NUM_FLOW_PRIORITY_STATS_RX) struct mlx4_en_stat_out_flow_control_mbox { /* Total number of PAUSE frames received from the far-end port */ @@ -108,7 +107,7 @@ enum { }; #define NUM_ALL_STATS (NUM_MAIN_STATS + NUM_PORT_STATS + NUM_PKT_STATS + \ - NUM_FLOW_STATS + NUM_PERF_STATS) + NUM_FLOW_STATS + NUM_PERF_STATS + NUM_PF_STATS) #define MLX4_FIND_NETDEV_STAT(n) (offsetof(struct net_device_stats, n) / \ sizeof(((struct net_device_stats *)0)->n)) |