Commit 89abb6b3 authored by Rosen Penev's avatar Rosen Penev Committed by Jakub Kicinski
Browse files

ibmvnic: use ethtool string helpers 



They are the preferred way to copy ethtool strings.

Avoids manually incrementing the data pointer.

Signed-off-by: default avatarRosen Penev <rosenp@gmail.com>
Tested-by: default avatarNick Child <nnac123@linux.ibm.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20241022203240.391648-1-rosenp@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 4dbc8d6d

drivers/net/ethernet/ibm/ibmvnic.c

+9 −21
Original line number Diff line number Diff line
@@ -3808,32 +3808,20 @@ static void ibmvnic_get_strings(struct net_device *dev, u32 stringset, u8 *data) 
	if (stringset != ETH_SS_STATS)

		return;



	for (i = 0; i < ARRAY_SIZE(ibmvnic_stats); i++, data += ETH_GSTRING_LEN)

		memcpy(data, ibmvnic_stats[i].name, ETH_GSTRING_LEN);

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

		ethtool_puts(&data, ibmvnic_stats[i].name);



	for (i = 0; i < adapter->req_tx_queues; i++) {

		snprintf(data, ETH_GSTRING_LEN, "tx%d_batched_packets", i);

		data += ETH_GSTRING_LEN;



		snprintf(data, ETH_GSTRING_LEN, "tx%d_direct_packets", i);

		data += ETH_GSTRING_LEN;



		snprintf(data, ETH_GSTRING_LEN, "tx%d_bytes", i);

		data += ETH_GSTRING_LEN;



		snprintf(data, ETH_GSTRING_LEN, "tx%d_dropped_packets", i);

		data += ETH_GSTRING_LEN;

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

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

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

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

	}



	for (i = 0; i < adapter->req_rx_queues; i++) {

		snprintf(data, ETH_GSTRING_LEN, "rx%d_packets", i);

		data += ETH_GSTRING_LEN;



		snprintf(data, ETH_GSTRING_LEN, "rx%d_bytes", i);

		data += ETH_GSTRING_LEN;



		snprintf(data, ETH_GSTRING_LEN, "rx%d_interrupts", i);

		data += ETH_GSTRING_LEN;

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

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

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

	}

}