| Message ID | 20241022233203.9670-1-rosenp@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | cf57ee160152056724cdecf7445d924407259ae9 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] amd-xgbe: use ethtool string helpers | expand |
On 10/23/2024 05:02, Rosen Penev wrote: > The latter is the preferred way to copy ethtool strings. > > Avoids manually incrementing the pointer. > > Signed-off-by: Rosen Penev <rosenp@gmail.com> Looks good to me. Acked-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com> Thanks, Shyam > --- > drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c | 22 ++++++++------------ > 1 file changed, 9 insertions(+), 13 deletions(-) > > diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c > index 5fc94c2f638e..4431ab1c18b3 100644 > --- a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c > +++ b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c > @@ -195,23 +195,19 @@ static void xgbe_get_strings(struct net_device *netdev, u32 stringset, u8 *data) > > switch (stringset) { > case ETH_SS_STATS: > - for (i = 0; i < XGBE_STATS_COUNT; i++) { > - memcpy(data, xgbe_gstring_stats[i].stat_string, > - ETH_GSTRING_LEN); > - data += ETH_GSTRING_LEN; > - } > + for (i = 0; i < XGBE_STATS_COUNT; i++) > + ethtool_puts(&data, xgbe_gstring_stats[i].stat_string); > + > for (i = 0; i < pdata->tx_ring_count; i++) { > - sprintf(data, "txq_%u_packets", i); > - data += ETH_GSTRING_LEN; > - sprintf(data, "txq_%u_bytes", i); > - data += ETH_GSTRING_LEN; > + ethtool_sprintf(&data, "txq_%u_packets", i); > + ethtool_sprintf(&data, "txq_%u_bytes", i); > } > + > for (i = 0; i < pdata->rx_ring_count; i++) { > - sprintf(data, "rxq_%u_packets", i); > - data += ETH_GSTRING_LEN; > - sprintf(data, "rxq_%u_bytes", i); > - data += ETH_GSTRING_LEN; > + ethtool_sprintf(&data, "rxq_%u_packets", i); > + ethtool_sprintf(&data, "rxq_%u_bytes", i); > } > + > break; > } > }
On Tue, Oct 22, 2024 at 04:32:03PM -0700, Rosen Penev wrote: > The latter is the preferred way to copy ethtool strings. > > Avoids manually incrementing the pointer. > > Signed-off-by: Rosen Penev <rosenp@gmail.com> Reviewed-by: Simon Horman <horms@kernel.org>
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Tue, 22 Oct 2024 16:32:03 -0700 you wrote: > The latter is the preferred way to copy ethtool strings. > > Avoids manually incrementing the pointer. > > Signed-off-by: Rosen Penev <rosenp@gmail.com> > --- > drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c | 22 ++++++++------------ > 1 file changed, 9 insertions(+), 13 deletions(-) Here is the summary with links: - [net-next] amd-xgbe: use ethtool string helpers https://git.kernel.org/netdev/net-next/c/cf57ee160152 You are awesome, thank you!
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c index 5fc94c2f638e..4431ab1c18b3 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c @@ -195,23 +195,19 @@ static void xgbe_get_strings(struct net_device *netdev, u32 stringset, u8 *data) switch (stringset) { case ETH_SS_STATS: - for (i = 0; i < XGBE_STATS_COUNT; i++) { - memcpy(data, xgbe_gstring_stats[i].stat_string, - ETH_GSTRING_LEN); - data += ETH_GSTRING_LEN; - } + for (i = 0; i < XGBE_STATS_COUNT; i++) + ethtool_puts(&data, xgbe_gstring_stats[i].stat_string); + for (i = 0; i < pdata->tx_ring_count; i++) { - sprintf(data, "txq_%u_packets", i); - data += ETH_GSTRING_LEN; - sprintf(data, "txq_%u_bytes", i); - data += ETH_GSTRING_LEN; + ethtool_sprintf(&data, "txq_%u_packets", i); + ethtool_sprintf(&data, "txq_%u_bytes", i); } + for (i = 0; i < pdata->rx_ring_count; i++) { - sprintf(data, "rxq_%u_packets", i); - data += ETH_GSTRING_LEN; - sprintf(data, "rxq_%u_bytes", i); - data += ETH_GSTRING_LEN; + ethtool_sprintf(&data, "rxq_%u_packets", i); + ethtool_sprintf(&data, "rxq_%u_bytes", i); } + break; } }
The latter is the preferred way to copy ethtool strings. Avoids manually incrementing the pointer. Signed-off-by: Rosen Penev <rosenp@gmail.com> --- drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c | 22 ++++++++------------ 1 file changed, 9 insertions(+), 13 deletions(-)