From: Alexander Duyck <alexander.duyck@gmail.com>
To: davem@davemloft.net, kuba@kernel.org
Cc: netdev@vger.kernel.org, oss-drivers@netronome.com,
simon.horman@netronome.com, yisen.zhuang@huawei.com,
salil.mehta@huawei.com, intel-wired-lan@lists.osuosl.org,
jesse.brandeburg@intel.com, anthony.l.nguyen@intel.com,
drivers@pensando.io, snelson@pensando.io, netanel@amazon.com,
akiyano@amazon.com, gtzalik@amazon.com, saeedb@amazon.com,
GR-Linux-NIC-Dev@marvell.com, skalluru@marvell.com,
rmody@marvell.com, kys@microsoft.com, haiyangz@microsoft.com,
sthemmin@microsoft.com, wei.liu@kernel.org, mst@redhat.com,
jasowang@redhat.com, pv-drivers@vmware.com, doshir@vmware.com,
alexanderduyck@fb.com, Kernel-team@fb.com
Subject: [net-next PATCH 07/10] virtio_net: Update driver to use ethtool_sprintf
Date: Fri, 12 Mar 2021 09:48:46 -0800 [thread overview]
Message-ID: <161557132651.10304.9382850626606060019.stgit@localhost.localdomain> (raw)
In-Reply-To: <161557111604.10304.1798900949114188676.stgit@localhost.localdomain>
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;
}
next prev parent reply other threads:[~2021-03-12 17:49 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-12 17:48 [net-next PATCH 00/10] ethtool: Factor out common code related to writing ethtool strings Alexander Duyck
2021-03-12 17:48 ` [net-next PATCH 01/10] ethtool: Add common function for filling out strings Alexander Duyck
2021-03-12 17:48 ` [net-next PATCH 02/10] intel: Update drivers to use ethtool_sprintf Alexander Duyck
2021-03-16 6:56 ` [Intel-wired-lan] " Wang, Haiyue
2021-03-12 17:48 ` [net-next PATCH 03/10] nfp: Replace nfp_pr_et with ethtool_sprintf Alexander Duyck
2021-03-12 17:48 ` [net-next PATCH 04/10] hisilicon: Update drivers to use ethtool_sprintf Alexander Duyck
2021-03-12 17:48 ` [net-next PATCH 05/10] ena: Update driver " Alexander Duyck
2021-03-14 8:30 ` Kiyanovski, Arthur
2021-03-12 17:48 ` [net-next PATCH 06/10] netvsc: " Alexander Duyck
2021-03-12 17:48 ` Alexander Duyck [this message]
2021-03-14 8:56 ` [net-next PATCH 07/10] virtio_net: " Michael S. Tsirkin
2021-03-15 3:52 ` Jason Wang
2021-03-12 17:48 ` [net-next PATCH 08/10] vmxnet3: " Alexander Duyck
2021-03-12 17:48 ` [net-next PATCH 09/10] bna: " Alexander Duyck
2021-03-12 17:49 ` [net-next PATCH 10/10] ionic: " Alexander Duyck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=161557132651.10304.9382850626606060019.stgit@localhost.localdomain \
--to=alexander.duyck@gmail.com \
--cc=GR-Linux-NIC-Dev@marvell.com \
--cc=Kernel-team@fb.com \
--cc=akiyano@amazon.com \
--cc=alexanderduyck@fb.com \
--cc=anthony.l.nguyen@intel.com \
--cc=davem@davemloft.net \
--cc=doshir@vmware.com \
--cc=drivers@pensando.io \
--cc=gtzalik@amazon.com \
--cc=haiyangz@microsoft.com \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=jasowang@redhat.com \
--cc=jesse.brandeburg@intel.com \
--cc=kuba@kernel.org \
--cc=kys@microsoft.com \
--cc=mst@redhat.com \
--cc=netanel@amazon.com \
--cc=netdev@vger.kernel.org \
--cc=oss-drivers@netronome.com \
--cc=pv-drivers@vmware.com \
--cc=rmody@marvell.com \
--cc=saeedb@amazon.com \
--cc=salil.mehta@huawei.com \
--cc=simon.horman@netronome.com \
--cc=skalluru@marvell.com \
--cc=snelson@pensando.io \
--cc=sthemmin@microsoft.com \
--cc=wei.liu@kernel.org \
--cc=yisen.zhuang@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox