UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

net/mlx5e: Changed naming convention of tx queues in ethtool stats 

Instead of the pair (channel, tc), we now use a single number that
goes over all tx queues of a TC, for all TCs.

Signed-off-by: Tariq Toukan <tariqt@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Tariq Toukan 2016-03-02 00:13:34 +02:00 committed by David S. Miller
parent ce89ef36d2
commit 3b6195240c
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
View File

@ -211,13 +211,14 @@ static void mlx5e_get_strings(struct net_device *dev,
sprintf(data + (idx++) * ETH_GSTRING_LEN, sprintf(data + (idx++) * ETH_GSTRING_LEN,
"rx%d_%s", i, rq_stats_strings[j]); "rx%d_%s", i, rq_stats_strings[j]);
for (i = 0; i < priv->params.num_channels; i++) for (tc = 0; tc < priv->params.num_tc; tc++)
for (tc = 0; tc < priv->params.num_tc; tc++) for (i = 0; i < priv->params.num_channels; i++)
for (j = 0; j < NUM_SQ_STATS; j++) for (j = 0; j < NUM_SQ_STATS; j++)
sprintf(data + sprintf(data +
(idx++) * ETH_GSTRING_LEN, (idx++) * ETH_GSTRING_LEN,
"tx%d_%d_%s", i, tc, "tx%d_%s",
sq_stats_strings[j]); priv->channeltc_to_txq_map[i][tc],
sq_stats_strings[j]);
break; break;
} }
} }
@ -249,8 +250,8 @@ static void mlx5e_get_ethtool_stats(struct net_device *dev,
&priv->state) ? 0 : &priv->state) ? 0 :
((u64 *)&priv->channel[i]->rq.stats)[j]; ((u64 *)&priv->channel[i]->rq.stats)[j];
for (i = 0; i < priv->params.num_channels; i++) for (tc = 0; tc < priv->params.num_tc; tc++)
for (tc = 0; tc < priv->params.num_tc; tc++) for (i = 0; i < priv->params.num_channels; i++)
for (j = 0; j < NUM_SQ_STATS; j++) for (j = 0; j < NUM_SQ_STATS; j++)
data[idx++] = !test_bit(MLX5E_STATE_OPENED, data[idx++] = !test_bit(MLX5E_STATE_OPENED,
&priv->state) ? 0 : &priv->state) ? 0 :