88 lines
3.7 KiB
Diff
88 lines
3.7 KiB
Diff
From c9289ca2b21ff678a5e6805f493de9285f404adb Mon Sep 17 00:00:00 2001
|
|
From: Hao Chen <chenhao288@hisilicon.com>
|
|
Date: Tue, 28 Sep 2021 11:52:08 +0800
|
|
Subject: [PATCH 116/283] net: hns3: add required space in comment
|
|
|
|
mainline inclusion
|
|
from mainline-v5.15-rc1
|
|
commit 0cb0704149f0d9d3b7c68ebab932fc27222c740b
|
|
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=0cb0704149f0d9d3b7c68ebab932fc27222c740b
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
Add some required spaces in comment for cleanup.
|
|
|
|
Signed-off-by: Hao Chen <chenhao288@hisilicon.com>
|
|
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
Reviewed-by: Yongxin Li <liyongxin1@huawei.com>
|
|
Signed-off-by: Junxin Chen <chenjunxin1@huawei.com>
|
|
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>
|
|
Signed-off-by: Xiaodong Li <lixiaodong67@huawei.com>
|
|
---
|
|
drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h | 2 +-
|
|
drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 2 +-
|
|
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 2 +-
|
|
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 2 +-
|
|
4 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h b/drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h
|
|
index 5a13eea2742d..98045a4649e8 100644
|
|
--- a/drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h
|
|
+++ b/drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h
|
|
@@ -9,7 +9,7 @@
|
|
|
|
enum HCLGE_MBX_OPCODE {
|
|
HCLGE_MBX_RESET = 0x01, /* (VF -> PF) assert reset */
|
|
- HCLGE_MBX_ASSERTING_RESET, /* (PF -> VF) PF is asserting reset*/
|
|
+ HCLGE_MBX_ASSERTING_RESET, /* (PF -> VF) PF is asserting reset */
|
|
HCLGE_MBX_SET_UNICAST, /* (VF -> PF) set UC addr */
|
|
HCLGE_MBX_SET_MULTICAST, /* (VF -> PF) set MC addr */
|
|
HCLGE_MBX_SET_VLAN, /* (VF -> PF) set VLAN */
|
|
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h
|
|
index 3df794363632..9278c742e3b0 100644
|
|
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h
|
|
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.h
|
|
@@ -340,7 +340,7 @@ enum hns3_pkt_l3type {
|
|
HNS3_L3_TYPE_LLDP,
|
|
HNS3_L3_TYPE_BPDU,
|
|
HNS3_L3_TYPE_MAC_PAUSE,
|
|
- HNS3_L3_TYPE_PFC_PAUSE,/* 0x9*/
|
|
+ HNS3_L3_TYPE_PFC_PAUSE, /* 0x9 */
|
|
|
|
/* reserved for 0xA~0xB */
|
|
|
|
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h
|
|
index d17c85959507..c06070cfd4bc 100644
|
|
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h
|
|
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h
|
|
@@ -443,7 +443,7 @@ struct hclge_tc_thrd {
|
|
};
|
|
|
|
struct hclge_priv_buf {
|
|
- struct hclge_waterline wl; /* Waterline for low and high*/
|
|
+ struct hclge_waterline wl; /* Waterline for low and high */
|
|
u32 buf_size; /* TC private buffer size */
|
|
u32 tx_buf_size;
|
|
u32 enable; /* Enable TC private buffer or not */
|
|
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
|
|
index 2e1639eeae4d..30c98e0d12d4 100644
|
|
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
|
|
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
|
|
@@ -3375,7 +3375,7 @@ static irqreturn_t hclge_misc_irq_handle(int irq, void *data)
|
|
hclge_enable_vector(&hdev->misc_vector, false);
|
|
event_cause = hclge_check_event_cause(hdev, &clearval);
|
|
|
|
- /* vector 0 interrupt is shared with reset and mailbox source events.*/
|
|
+ /* vector 0 interrupt is shared with reset and mailbox source events. */
|
|
switch (event_cause) {
|
|
case HCLGE_VECTOR0_EVENT_ERR:
|
|
hclge_errhand_task_schedule(hdev);
|
|
--
|
|
2.34.1
|
|
|