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>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
index e9760f8957445f5a6264a9f9444354e715804e38..577b4b1e4de343232ae164fa7fcafa66c29ebbd5 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
@@ -211,13 +211,14 @@ static void mlx5e_get_strings(struct net_device *dev,
                                sprintf(data + (idx++) * ETH_GSTRING_LEN,
                                        "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++)
                                        sprintf(data +
-                                               (idx++) * ETH_GSTRING_LEN,
-                                               "tx%d_%d_%s", i, tc,
-                                               sq_stats_strings[j]);
+                                             (idx++) * ETH_GSTRING_LEN,
+                                             "tx%d_%s",
+                                             priv->channeltc_to_txq_map[i][tc],
+                                             sq_stats_strings[j]);
                break;
        }
 }
@@ -249,8 +250,8 @@ static void mlx5e_get_ethtool_stats(struct net_device *dev,
                                                &priv->state) ? 0 :
                                       ((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++)
                                data[idx++] = !test_bit(MLX5E_STATE_OPENED,
                                                        &priv->state) ? 0 :