60 lines
2.3 KiB
Diff
60 lines
2.3 KiB
Diff
From 6137d5eda93889675e6156568705fa50018d3672 Mon Sep 17 00:00:00 2001
|
|
From: Randy Dunlap <rdunlap@infradead.org>
|
|
Date: Thu, 18 Nov 2021 20:44:54 +0800
|
|
Subject: [PATCH 152/283] net: hisilicon: fix hsn3_ethtool kernel-doc warnings
|
|
|
|
mainline inclusion
|
|
from mainline-v5.16-rc1
|
|
commit 85879f131d78151847baf29f9557c5be1aa8e066
|
|
category: feature
|
|
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8EMYT
|
|
CVE: NA
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=85879f131d78151847baf29f9557c5be1aa8e066
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
Fix kernel-doc warnings and spacing in hns3_ethtool.c:
|
|
|
|
hns3_ethtool.c:246: warning: No description found for return value of 'hns3_lp_run_test'
|
|
hns3_ethtool.c:408: warning: expecting prototype for hns3_nic_self_test(). Prototype was for hns3_self_test() instead
|
|
|
|
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
|
|
Reported-by: kernel test robot <lkp@intel.com>
|
|
Cc: Peng Li <lipeng321@huawei.com>
|
|
Cc: Guangbin Huang <huangguangbin2@huawei.com>
|
|
Cc: Yisen Zhuang <yisen.zhuang@huawei.com>
|
|
Cc: Salil Mehta <salil.mehta@huawei.com>
|
|
Cc: "David S. Miller" <davem@davemloft.net>
|
|
Cc: Jakub Kicinski <kuba@kernel.org>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
Reviewed-by: Yongxin Li <liyongxin1@huawei.com>
|
|
Signed-off-by: Junxin Chen <chenjunxin1@huawei.com>
|
|
(fix conflicts: remove hns3_do_selftest's fix due to a previous fix: 65b017dc58d6 "net: hns3: fix prototype warning")
|
|
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>
|
|
Signed-off-by: Xiaodong Li <lixiaodong67@huawei.com>
|
|
---
|
|
drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
|
|
index 1624df0ac6e4..f7bb9c85e243 100644
|
|
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
|
|
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
|
|
@@ -246,9 +246,11 @@ static void hns3_lb_clear_tx_ring(struct hns3_nic_priv *priv, u32 start_ringid,
|
|
}
|
|
|
|
/**
|
|
- * hns3_lp_run_test - run loopback test
|
|
+ * hns3_lp_run_test - run loopback test
|
|
* @ndev: net device
|
|
* @mode: loopback type
|
|
+ *
|
|
+ * Return: %0 for success or a NIC loopback test error code on failure
|
|
*/
|
|
static int hns3_lp_run_test(struct net_device *ndev, enum hnae3_loop mode)
|
|
{
|
|
--
|
|
2.34.1
|
|
|