Commit f547e956 authored by Rosen Penev's avatar Rosen Penev Committed by David S. Miller
Browse files

net: sunvnet: use ethtool_sprintf/puts 



Simpler and allows avoiding manual pointer addition.

Signed-off-by: default avatarRosen Penev <rosenp@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c4e82c02

drivers/net/ethernet/sun/sunvnet.c

+10 −24
Original line number Diff line number Diff line
@@ -114,37 +114,23 @@ static void vnet_get_strings(struct net_device *dev, u32 stringset, u8 *buf) 
{

	struct vnet *vp = (struct vnet *)netdev_priv(dev);

	struct vnet_port *port;

	char *p = (char *)buf;



	switch (stringset) {

	case ETH_SS_STATS:

		memcpy(buf, &ethtool_stats_keys, sizeof(ethtool_stats_keys));

		p += sizeof(ethtool_stats_keys);

		buf += sizeof(ethtool_stats_keys);



		rcu_read_lock();

		list_for_each_entry_rcu(port, &vp->port_list, list) {

			snprintf(p, ETH_GSTRING_LEN, "p%u.%s-%pM",

				 port->q_index, port->switch_port ? "s" : "q",

			ethtool_sprintf(&buf, "p%u.%s-%pM", port->q_index,

					port->switch_port ? "s" : "q",

					port->raddr);

			p += ETH_GSTRING_LEN;

			snprintf(p, ETH_GSTRING_LEN, "p%u.rx_packets",

				 port->q_index);

			p += ETH_GSTRING_LEN;

			snprintf(p, ETH_GSTRING_LEN, "p%u.tx_packets",

				 port->q_index);

			p += ETH_GSTRING_LEN;

			snprintf(p, ETH_GSTRING_LEN, "p%u.rx_bytes",

				 port->q_index);

			p += ETH_GSTRING_LEN;

			snprintf(p, ETH_GSTRING_LEN, "p%u.tx_bytes",

				 port->q_index);

			p += ETH_GSTRING_LEN;

			snprintf(p, ETH_GSTRING_LEN, "p%u.event_up",

				 port->q_index);

			p += ETH_GSTRING_LEN;

			snprintf(p, ETH_GSTRING_LEN, "p%u.event_reset",

				 port->q_index);

			p += ETH_GSTRING_LEN;

			ethtool_sprintf(&buf, "p%u.rx_packets", port->q_index);

			ethtool_sprintf(&buf, "p%u.tx_packets", port->q_index);

			ethtool_sprintf(&buf, "p%u.rx_bytes", port->q_index);

			ethtool_sprintf(&buf, "p%u.tx_bytes", port->q_index);

			ethtool_sprintf(&buf, "p%u.event_up", port->q_index);

			ethtool_sprintf(&buf, "p%u.event_reset", port->q_index);

		}

		rcu_read_unlock();

		break;