Commit 2c6a4b96 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-mlx4_en-use-ethtool_puts-sprintf' 



Kamal Heib says:

====================
net/mlx4_en: Use ethtool_puts/sprintf

This patchset updates the mlx4_en driver to use the ethtool_puts and
ethtool_sprintf helper functions.

Signed-off-by: default avatarKamal Heib <kheib@redhat.com>
====================

Link: https://lore.kernel.org/r/20240617172329.239819-1-kheib@redhat.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 8c379e3c 6c7dd432

drivers/net/ethernet/mellanox/mlx4/en_ethtool.c

+20 −39
Original line number Diff line number Diff line
@@ -450,7 +450,6 @@ static void mlx4_en_get_strings(struct net_device *dev, 
				uint32_t stringset, uint8_t *data)

{

	struct mlx4_en_priv *priv = netdev_priv(dev);

	int index = 0;

	int i, strings = 0;

	struct bitmap_iterator it;
@@ -459,10 +458,10 @@ static void mlx4_en_get_strings(struct net_device *dev, 
	switch (stringset) {

	case ETH_SS_TEST:

		for (i = 0; i < MLX4_EN_NUM_SELF_TEST - 2; i++)

			strcpy(data + i * ETH_GSTRING_LEN, mlx4_en_test_names[i]);

			ethtool_puts(&data, mlx4_en_test_names[i]);

		if (priv->mdev->dev->caps.flags & MLX4_DEV_CAP_FLAG_UC_LOOPBACK)

			for (; i < MLX4_EN_NUM_SELF_TEST; i++)

				strcpy(data + i * ETH_GSTRING_LEN, mlx4_en_test_names[i]);

				ethtool_puts(&data, mlx4_en_test_names[i]);

		break;



	case ETH_SS_STATS:
@@ -470,74 +469,56 @@ static void mlx4_en_get_strings(struct net_device *dev, 
		for (i = 0; i < NUM_MAIN_STATS; i++, strings++,

		     bitmap_iterator_inc(&it))

			if (bitmap_iterator_test(&it))

				strcpy(data + (index++) * ETH_GSTRING_LEN,

				       main_strings[strings]);

				ethtool_puts(&data, main_strings[strings]);



		for (i = 0; i < NUM_PORT_STATS; i++, strings++,

		     bitmap_iterator_inc(&it))

			if (bitmap_iterator_test(&it))

				strcpy(data + (index++) * ETH_GSTRING_LEN,

				       main_strings[strings]);

				ethtool_puts(&data, main_strings[strings]);



		for (i = 0; i < NUM_PF_STATS; i++, strings++,

		     bitmap_iterator_inc(&it))

			if (bitmap_iterator_test(&it))

				strcpy(data + (index++) * ETH_GSTRING_LEN,

				       main_strings[strings]);

				ethtool_puts(&data, main_strings[strings]);



		for (i = 0; i < NUM_FLOW_STATS; i++, strings++,

		     bitmap_iterator_inc(&it))

			if (bitmap_iterator_test(&it))

				strcpy(data + (index++) * ETH_GSTRING_LEN,

				       main_strings[strings]);

				ethtool_puts(&data, main_strings[strings]);



		for (i = 0; i < NUM_PKT_STATS; i++, strings++,

		     bitmap_iterator_inc(&it))

			if (bitmap_iterator_test(&it))

				strcpy(data + (index++) * ETH_GSTRING_LEN,

				       main_strings[strings]);

				ethtool_puts(&data, main_strings[strings]);



		for (i = 0; i < NUM_XDP_STATS; i++, strings++,

		     bitmap_iterator_inc(&it))

			if (bitmap_iterator_test(&it))

				strcpy(data + (index++) * ETH_GSTRING_LEN,

				       main_strings[strings]);

				ethtool_puts(&data, main_strings[strings]);



		for (i = 0; i < NUM_PHY_STATS; i++, strings++,

		     bitmap_iterator_inc(&it))

			if (bitmap_iterator_test(&it))

				strcpy(data + (index++) * ETH_GSTRING_LEN,

				       main_strings[strings]);

				ethtool_puts(&data, main_strings[strings]);



		for (i = 0; i < priv->tx_ring_num[TX]; i++) {

			sprintf(data + (index++) * ETH_GSTRING_LEN,

				"tx%d_packets", i);

			sprintf(data + (index++) * ETH_GSTRING_LEN,

				"tx%d_bytes", i);

			ethtool_sprintf(&data, "tx%d_packets", i);

			ethtool_sprintf(&data, "tx%d_bytes", i);

		}

		for (i = 0; i < priv->rx_ring_num; i++) {

			sprintf(data + (index++) * ETH_GSTRING_LEN,

				"rx%d_packets", i);

			sprintf(data + (index++) * ETH_GSTRING_LEN,

				"rx%d_bytes", i);

			sprintf(data + (index++) * ETH_GSTRING_LEN,

				"rx%d_dropped", i);

			sprintf(data + (index++) * ETH_GSTRING_LEN,

				"rx%d_xdp_drop", i);

			sprintf(data + (index++) * ETH_GSTRING_LEN,

				"rx%d_xdp_redirect", i);

			sprintf(data + (index++) * ETH_GSTRING_LEN,

				"rx%d_xdp_redirect_fail", i);

			sprintf(data + (index++) * ETH_GSTRING_LEN,

				"rx%d_xdp_tx", i);

			sprintf(data + (index++) * ETH_GSTRING_LEN,

				"rx%d_xdp_tx_full", i);

			ethtool_sprintf(&data, "rx%d_packets", i);

			ethtool_sprintf(&data, "rx%d_bytes", i);

			ethtool_sprintf(&data, "rx%d_dropped", i);

			ethtool_sprintf(&data, "rx%d_xdp_drop", i);

			ethtool_sprintf(&data, "rx%d_xdp_redirect", i);

			ethtool_sprintf(&data, "rx%d_xdp_redirect_fail", i);

			ethtool_sprintf(&data, "rx%d_xdp_tx", i);

			ethtool_sprintf(&data, "rx%d_xdp_tx_full", i);

		}

		break;

	case ETH_SS_PRIV_FLAGS:

		for (i = 0; i < ARRAY_SIZE(mlx4_en_priv_flags); i++)

			strcpy(data + i * ETH_GSTRING_LEN,

			       mlx4_en_priv_flags[i]);

			ethtool_puts(&data, mlx4_en_priv_flags[i]);

		break;



	}