Thread (15 messages) flat view 15 messages, 5 authors, 2021-03-16

Re: [net-next PATCH 07/10] virtio_net: Update driver to use ethtool_sprintf

From: Jason Wang <hidden>
Date: 2021-03-15 03:53:33
Also in: intel-wired-lan

在 2021/3/13 上午1:48, Alexander Duyck 写道:
quoted hunk ↗ jump to hunk
From: Alexander Duyck <alexanderduyck@fb.com>

Update the code to replace instances of snprintf and a pointer update with
just calling ethtool_sprintf.

Also replace the char pointer with a u8 pointer to avoid having to recast
the pointer type.

Signed-off-by: Alexander Duyck <alexanderduyck@fb.com>
---
  drivers/net/virtio_net.c |   18 +++++++-----------
  1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index e97288dd6e5a..77ba8e2fc11c 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -2138,25 +2138,21 @@ static int virtnet_set_channels(struct net_device *dev,
  static void virtnet_get_strings(struct net_device *dev, u32 stringset, u8 *data)
  {
  	struct virtnet_info *vi = netdev_priv(dev);
-	char *p = (char *)data;
  	unsigned int i, j;
+	u8 *p = data;
  
  	switch (stringset) {
  	case ETH_SS_STATS:
  		for (i = 0; i < vi->curr_queue_pairs; i++) {
-			for (j = 0; j < VIRTNET_RQ_STATS_LEN; j++) {
-				snprintf(p, ETH_GSTRING_LEN, "rx_queue_%u_%s",
-					 i, virtnet_rq_stats_desc[j].desc);
-				p += ETH_GSTRING_LEN;
-			}
+			for (j = 0; j < VIRTNET_RQ_STATS_LEN; j++)
+				ethtool_sprintf(&p, "rx_queue_%u_%s", i,
+						virtnet_rq_stats_desc[j].desc);
  		}
  
  		for (i = 0; i < vi->curr_queue_pairs; i++) {
-			for (j = 0; j < VIRTNET_SQ_STATS_LEN; j++) {
-				snprintf(p, ETH_GSTRING_LEN, "tx_queue_%u_%s",
-					 i, virtnet_sq_stats_desc[j].desc);
-				p += ETH_GSTRING_LEN;
-			}
+			for (j = 0; j < VIRTNET_SQ_STATS_LEN; j++)
+				ethtool_sprintf(&p, "tx_queue_%u_%s", i,
+						virtnet_sq_stats_desc[j].desc);
  		}
  		break;
  	}

Acked-by: Jason Wang <redacted>


  
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help