Commit 3ae0ed37 authored by Alexander Duyck's avatar Alexander Duyck Committed by David S. Miller
Browse files

netvsc: Update driver to use ethtool_sprintf 



Replace instances of sprintf or memcpy with a pointer update with
ethtool_sprintf.

Signed-off-by: default avatarAlexander Duyck <alexanderduyck@fb.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent efbbe4fb

drivers/net/hyperv/netvsc_drv.c

+11 −22
Original line number Diff line number Diff line
@@ -1612,34 +1612,23 @@ static void netvsc_get_strings(struct net_device *dev, u32 stringset, u8 *data) 


	switch (stringset) {

	case ETH_SS_STATS:

		for (i = 0; i < ARRAY_SIZE(netvsc_stats); i++) {

			memcpy(p, netvsc_stats[i].name, ETH_GSTRING_LEN);

			p += ETH_GSTRING_LEN;

		}

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

			ethtool_sprintf(&p, netvsc_stats[i].name);



		for (i = 0; i < ARRAY_SIZE(vf_stats); i++) {

			memcpy(p, vf_stats[i].name, ETH_GSTRING_LEN);

			p += ETH_GSTRING_LEN;

		}

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

			ethtool_sprintf(&p, vf_stats[i].name);



		for (i = 0; i < nvdev->num_chn; i++) {

			sprintf(p, "tx_queue_%u_packets", i);

			p += ETH_GSTRING_LEN;

			sprintf(p, "tx_queue_%u_bytes", i);

			p += ETH_GSTRING_LEN;

			sprintf(p, "rx_queue_%u_packets", i);

			p += ETH_GSTRING_LEN;

			sprintf(p, "rx_queue_%u_bytes", i);

			p += ETH_GSTRING_LEN;

			sprintf(p, "rx_queue_%u_xdp_drop", i);

			p += ETH_GSTRING_LEN;

			ethtool_sprintf(&p, "tx_queue_%u_packets", i);

			ethtool_sprintf(&p, "tx_queue_%u_bytes", i);

			ethtool_sprintf(&p, "rx_queue_%u_packets", i);

			ethtool_sprintf(&p, "rx_queue_%u_bytes", i);

			ethtool_sprintf(&p, "rx_queue_%u_xdp_drop", i);

		}



		for_each_present_cpu(cpu) {

			for (i = 0; i < ARRAY_SIZE(pcpu_stats); i++) {

				sprintf(p, pcpu_stats[i].name, cpu);

				p += ETH_GSTRING_LEN;

			}

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

				ethtool_sprintf(&p, pcpu_stats[i].name, cpu);

		}



		break;