diff options
| author |   Chen Zhou <chenzhou10@huawei.com> | 2020-01-20 20:50:33 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-01-21 10:48:40 +0100 |
| commit | bea5416561b1b997adbe3a04a5665e647c589a13 (patch) | |
| tree | 3c4b8f4d0e7cadc32b8127bd8b062854dfdf7181 /drivers/net/ethernet/hisilicon | |
| parent | net: hns3: replace snprintf with scnprintf in hns3_dbg_cmd_read (diff) | |
| download | linux-dev-bea5416561b1b997adbe3a04a5665e647c589a13.tar.xz linux-dev-bea5416561b1b997adbe3a04a5665e647c589a13.zip | |
net: hns3: replace snprintf with scnprintf in hns3_update_strings
snprintf returns the number of bytes that would be written, which may be
greater than the the actual length to be written. Here use extra code to
handle this.
scnprintf returns the number of bytes that was actually written, just use
scnprintf to simplify the code.
Signed-off-by: Chen Zhou <chenzhou10@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/hisilicon')
| -rw-r--r-- | drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c index 6e0212b79438..c03856e63320 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c @@ -423,9 +423,8 @@ static void *hns3_update_strings(u8 *data, const struct hns3_stats *stats, data[ETH_GSTRING_LEN - 1] = '\0'; /* first, prepend the prefix string */ - n1 = snprintf(data, MAX_PREFIX_SIZE, "%s%d_", - prefix, i); - n1 = min_t(uint, n1, MAX_PREFIX_SIZE - 1); + n1 = scnprintf(data, MAX_PREFIX_SIZE, "%s%d_", + prefix, i); size_left = (ETH_GSTRING_LEN - 1) - n1; /* now, concatenate the stats string to it */ |