| Message ID | 161557131360.10304.1549281998235246752.stgit@localhost.localdomain |
|---|---|
| State | Awaiting Upstream |
| Headers | show |
| Series | ethtool: Factor out common code related to writing ethtool strings | expand |
> -----Original Message----- > From: Alexander Duyck <alexander.duyck@gmail.com> > Sent: Friday, March 12, 2021 7:49 PM > 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; Belgazal, Netanel > <netanel@amazon.com>; Kiyanovski, Arthur <akiyano@amazon.com>; > Tzalik, Guy <gtzalik@amazon.com>; Bshara, Saeed <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: [EXTERNAL] [net-next PATCH 05/10] ena: Update driver to use > ethtool_sprintf > > From: Alexander Duyck <alexanderduyck@fb.com> > > Replace instances of snprintf or memcpy with a pointer update with > ethtool_sprintf. > > Acked-by: Arthur Kiyanovski <akiyano@amazon.com> > Signed-off-by: Alexander Duyck <alexanderduyck@fb.com> > --- > drivers/net/ethernet/amazon/ena/ena_ethtool.c | 25 +++++++++++------- > ------- > 1 file changed, 11 insertions(+), 14 deletions(-) > Acked-by: Arthur Kiyanovski <akiyano@amazon.com>
diff --git a/drivers/net/ethernet/amazon/ena/ena_ethtool.c b/drivers/net/ethernet/amazon/ena/ena_ethtool.c index d6cc7aa612b7..2fe7ccee55b2 100644 --- a/drivers/net/ethernet/amazon/ena/ena_ethtool.c +++ b/drivers/net/ethernet/amazon/ena/ena_ethtool.c @@ -251,10 +251,10 @@ static void ena_queue_strings(struct ena_adapter *adapter, u8 **data) for (j = 0; j < ENA_STATS_ARRAY_TX; j++) { ena_stats = &ena_stats_tx_strings[j]; - snprintf(*data, ETH_GSTRING_LEN, - "queue_%u_%s_%s", i, - is_xdp ? "xdp_tx" : "tx", ena_stats->name); - (*data) += ETH_GSTRING_LEN; + ethtool_sprintf(data, + "queue_%u_%s_%s", i, + is_xdp ? "xdp_tx" : "tx", + ena_stats->name); } if (!is_xdp) { @@ -264,9 +264,9 @@ static void ena_queue_strings(struct ena_adapter *adapter, u8 **data) for (j = 0; j < ENA_STATS_ARRAY_RX; j++) { ena_stats = &ena_stats_rx_strings[j]; - snprintf(*data, ETH_GSTRING_LEN, - "queue_%u_rx_%s", i, ena_stats->name); - (*data) += ETH_GSTRING_LEN; + ethtool_sprintf(data, + "queue_%u_rx_%s", i, + ena_stats->name); } } } @@ -280,9 +280,8 @@ static void ena_com_dev_strings(u8 **data) for (i = 0; i < ENA_STATS_ARRAY_ENA_COM; i++) { ena_stats = &ena_stats_ena_com_strings[i]; - snprintf(*data, ETH_GSTRING_LEN, - "ena_admin_q_%s", ena_stats->name); - (*data) += ETH_GSTRING_LEN; + ethtool_sprintf(data, + "ena_admin_q_%s", ena_stats->name); } } @@ -295,15 +294,13 @@ static void ena_get_strings(struct ena_adapter *adapter, for (i = 0; i < ENA_STATS_ARRAY_GLOBAL; i++) { ena_stats = &ena_stats_global_strings[i]; - memcpy(data, ena_stats->name, ETH_GSTRING_LEN); - data += ETH_GSTRING_LEN; + ethtool_sprintf(&data, ena_stats->name); } if (eni_stats_needed) { for (i = 0; i < ENA_STATS_ARRAY_ENI(adapter); i++) { ena_stats = &ena_stats_eni_strings[i]; - memcpy(data, ena_stats->name, ETH_GSTRING_LEN); - data += ETH_GSTRING_LEN; + ethtool_sprintf(&data, ena_stats->name); } }