Message ID | 20211125015438.5355-1-xiangxia.m.yue@gmail.com (mailing list archive) |
---|---|
State | Superseded |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [net-next] veth: use ethtool_sprintf instead of snprintf | expand |
On Thu, 25 Nov 2021 09:54:38 +0800 xiangxia.m.yue@gmail.com wrote: > for (i = 0; i < dev->real_num_rx_queues; i++) { > - for (j = 0; j < VETH_RQ_STATS_LEN; j++) { > - snprintf(p, ETH_GSTRING_LEN, > - "rx_queue_%u_%.18s", > - i, veth_rq_stats_desc[j].desc); > - p += ETH_GSTRING_LEN; > - } > + for (j = 0; j < VETH_RQ_STATS_LEN; j++) > + ethtool_sprintf(&p, "rx_queue_%u_%.18s", > + i, veth_rq_stats_desc[j].desc); > } > for (i = 0; i < dev->real_num_tx_queues; i++) { > - for (j = 0; j < VETH_TQ_STATS_LEN; j++) { > - snprintf(p, ETH_GSTRING_LEN, > - "tx_queue_%u_%.18s", > - i, veth_tq_stats_desc[j].desc); > - p += ETH_GSTRING_LEN; > - } > + for (j = 0; j < VETH_TQ_STATS_LEN; j++) > + ethtool_sprintf(&p, "tx_queue_%u_%.18s", > + i, veth_tq_stats_desc[j].desc); > } You can drop the brackets from the outside for as well.
diff --git a/drivers/net/veth.c b/drivers/net/veth.c index 5ca0a899101d..d1c3a3ff4928 100644 --- a/drivers/net/veth.c +++ b/drivers/net/veth.c @@ -134,7 +134,7 @@ static void veth_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *inf static void veth_get_strings(struct net_device *dev, u32 stringset, u8 *buf) { - char *p = (char *)buf; + u8 *p = buf; int i, j; switch(stringset) { @@ -142,20 +142,14 @@ static void veth_get_strings(struct net_device *dev, u32 stringset, u8 *buf) memcpy(p, ðtool_stats_keys, sizeof(ethtool_stats_keys)); p += sizeof(ethtool_stats_keys); for (i = 0; i < dev->real_num_rx_queues; i++) { - for (j = 0; j < VETH_RQ_STATS_LEN; j++) { - snprintf(p, ETH_GSTRING_LEN, - "rx_queue_%u_%.18s", - i, veth_rq_stats_desc[j].desc); - p += ETH_GSTRING_LEN; - } + for (j = 0; j < VETH_RQ_STATS_LEN; j++) + ethtool_sprintf(&p, "rx_queue_%u_%.18s", + i, veth_rq_stats_desc[j].desc); } for (i = 0; i < dev->real_num_tx_queues; i++) { - for (j = 0; j < VETH_TQ_STATS_LEN; j++) { - snprintf(p, ETH_GSTRING_LEN, - "tx_queue_%u_%.18s", - i, veth_tq_stats_desc[j].desc); - p += ETH_GSTRING_LEN; - } + for (j = 0; j < VETH_TQ_STATS_LEN; j++) + ethtool_sprintf(&p, "tx_queue_%u_%.18s", + i, veth_tq_stats_desc[j].desc); } break; }