From c456860173863a3edd4299a6de0ac249517e87d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8F=A0=E8=90=9D=E6=9C=89=E7=82=B9=E9=85=B8?= Date: Wed, 27 Nov 2024 06:38:47 +0000 Subject: [PATCH 1/6] update sas/user_cmd/cmd_code/sas_cmd_anacq.c. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 菠萝有点酸 --- sas/user_cmd/cmd_code/sas_cmd_anacq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sas/user_cmd/cmd_code/sas_cmd_anacq.c b/sas/user_cmd/cmd_code/sas_cmd_anacq.c index 46bf5aa..6e39dae 100644 --- a/sas/user_cmd/cmd_code/sas_cmd_anacq.c +++ b/sas/user_cmd/cmd_code/sas_cmd_anacq.c @@ -25,8 +25,8 @@ static int sas_anacq_help(struct major_cmd_ctrl *self, const char *argv) printf(" %s, %-25s %s\n", "-d", "--dieid", "please input die id[x] first\n"); printf("\n Options:\n\n"); printf(" %s, %-25s %s\n", "-h", "--help", "display this help and exit\n"); - printf(" %s, %-25s %s\n", "-p", "--pointer", "dispaly cq queue read/write pointer\n"); - printf(" %s, %-25s %s\n", "-s", "--number", "dispaly cq number\n"); + printf(" %s, %-25s %s\n", "-p", "--pointer", "display cq queue read/write pointer\n"); + printf(" %s, %-25s %s\n", "-s", "--number", "display cq number\n"); printf("\n"); return 0; -- Gitee From 86c65794481b1484a95c5361684fae851d2de3be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8F=A0=E8=90=9D=E6=9C=89=E7=82=B9=E9=85=B8?= Date: Wed, 27 Nov 2024 06:39:13 +0000 Subject: [PATCH 2/6] update sas/user_cmd/cmd_code/sas_cmd_dqe.c. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 菠萝有点酸 --- sas/user_cmd/cmd_code/sas_cmd_dqe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sas/user_cmd/cmd_code/sas_cmd_dqe.c b/sas/user_cmd/cmd_code/sas_cmd_dqe.c index 26bf0eb..ba34047 100644 --- a/sas/user_cmd/cmd_code/sas_cmd_dqe.c +++ b/sas/user_cmd/cmd_code/sas_cmd_dqe.c @@ -26,7 +26,7 @@ static int sas_dqe_help(struct major_cmd_ctrl *self, const char *argv) printf(" %s, %-25s %s\n", "-q", "--queue", "please input queue id[x] first\n"); printf("\n Options:\n\n"); printf(" %s, %-25s %s\n", "-h", "--help", "display this help and exit\n"); - printf(" %s, %-25s %s\n", "-i", "--info", "dispaly the dqe detail information\n"); + printf(" %s, %-25s %s\n", "-i", "--info", "display the dqe detail information\n"); printf("\n"); return 0; -- Gitee From 73609828b8e8ef7b6a29e57cf51e5921197373bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8F=A0=E8=90=9D=E6=9C=89=E7=82=B9=E9=85=B8?= Date: Wed, 27 Nov 2024 06:39:59 +0000 Subject: [PATCH 3/6] update net/nic/nic_ppp/hikp_nic_ppp.c. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 菠萝有点酸 --- net/nic/nic_ppp/hikp_nic_ppp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/nic/nic_ppp/hikp_nic_ppp.c b/net/nic/nic_ppp/hikp_nic_ppp.c index aa63f12..cc0f689 100644 --- a/net/nic/nic_ppp/hikp_nic_ppp.c +++ b/net/nic/nic_ppp/hikp_nic_ppp.c @@ -546,7 +546,7 @@ static int hikp_nic_ppp_query_uc_mac_addr(struct hikp_cmd_header *req_header, } if (entry_size + rsp_head.cur_blk_entry_cnt > max_hw_entry_size) { HIKP_ERROR_PRINT("The sum of entry number (%u) after block-%u " - "is over the maximum entry nubmer (%u) of unicast MAC table.\n", + "is over the maximum entry number (%u) of unicast MAC table.\n", entry_size + rsp_head.cur_blk_entry_cnt, idx, max_hw_entry_size); return -EINVAL; } @@ -588,7 +588,7 @@ static int hikp_nic_ppp_query_mc_mac_addr(struct hikp_cmd_header *req_header, } if (entry_size + rsp_head.cur_blk_entry_cnt > max_hw_entry_size) { HIKP_ERROR_PRINT("The sum of entry number (%u) after block-%u " - "is over the maximum entry nubmer (%u) of multicast MAC table.\n", + "is over the maximum entry number (%u) of multicast MAC table.\n", entry_size + rsp_head.cur_blk_entry_cnt, idx, max_hw_entry_size); return -EINVAL; } @@ -659,7 +659,7 @@ static int hikp_nic_ppp_query_vf_vlan_tbl(struct hikp_cmd_header *req_header, } if (entry_size + rsp_head.cur_blk_entry_cnt > hw_entry_size) { HIKP_ERROR_PRINT("The sum of entry number (%u) after block-%u " - "is over the maximum entry nubmer (%u) of VF VLAN table.\n", + "is over the maximum entry number (%u) of VF VLAN table.\n", entry_size + rsp_head.cur_blk_entry_cnt, idx, hw_entry_size); return -EINVAL; } @@ -700,7 +700,7 @@ static int hikp_nic_ppp_query_port_vlan_tbl(struct hikp_cmd_header *req_header, } if (entry_size + rsp_head.cur_blk_entry_cnt > hw_entry_size) { HIKP_ERROR_PRINT("The sum of entry number (%u) after block-%u " - "is over the maximum entry nubmer (%u) of port VLAN table.\n", + "is over the maximum entry number (%u) of port VLAN table.\n", entry_size + rsp_head.cur_blk_entry_cnt, idx, hw_entry_size); return -EINVAL; } -- Gitee From 199f254abd17f20cd4cba6a2da8ed4d8596d3858 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8F=A0=E8=90=9D=E6=9C=89=E7=82=B9=E9=85=B8?= Date: Wed, 27 Nov 2024 06:40:54 +0000 Subject: [PATCH 4/6] update net/nic/nic_ppp/hikp_nic_ppp.c. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 菠萝有点酸 --- net/nic/nic_ppp/hikp_nic_ppp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/nic/nic_ppp/hikp_nic_ppp.c b/net/nic/nic_ppp/hikp_nic_ppp.c index cc0f689..c19a5d0 100644 --- a/net/nic/nic_ppp/hikp_nic_ppp.c +++ b/net/nic/nic_ppp/hikp_nic_ppp.c @@ -762,7 +762,7 @@ static int hikp_nic_query_mng_tbl(struct hikp_cmd_header *req_header, } if (entry_size + rsp_head.cur_blk_entry_cnt > g_ppp_hw_res.mng_tbl_size) { HIKP_ERROR_PRINT("The sum of entry number (%u) after block-%u " - "is over the maximum entry nubmer (%u) of manager table.\n", + "is over the maximum entry number (%u) of manager table.\n", entry_size + rsp_head.cur_blk_entry_cnt, idx, g_ppp_hw_res.mng_tbl_size); return -EINVAL; } -- Gitee From c746656747138f2d1428e07aaf7ddb256064b320 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8F=A0=E8=90=9D=E6=9C=89=E7=82=B9=E9=85=B8?= Date: Wed, 27 Nov 2024 06:41:32 +0000 Subject: [PATCH 5/6] update net/nic/nic_ppp/hikp_nic_ppp.h. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 菠萝有点酸 --- net/nic/nic_ppp/hikp_nic_ppp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/nic/nic_ppp/hikp_nic_ppp.h b/net/nic/nic_ppp/hikp_nic_ppp.h index 033ca4d..659ed57 100644 --- a/net/nic/nic_ppp/hikp_nic_ppp.h +++ b/net/nic/nic_ppp/hikp_nic_ppp.h @@ -40,7 +40,7 @@ struct hikp_nic_ppp_hw_resources { uint32_t rsv1[10]; }; -/* struct mac_vlan_uc_entry::e_vport field defination: +/* struct mac_vlan_uc_entry::e_vport field definition: * bit[0-2]: pf_id * bit[3-10]: vf_id */ -- Gitee From ec9e4ab74b5b6581766df46b02c32e7f4ec30ca9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8F=A0=E8=90=9D=E6=9C=89=E7=82=B9=E9=85=B8?= Date: Wed, 27 Nov 2024 06:43:32 +0000 Subject: [PATCH 6/6] update net/nic/nic_fd/hikp_nic_fd.c. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 菠萝有点酸 --- net/nic/nic_fd/hikp_nic_fd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/nic/nic_fd/hikp_nic_fd.c b/net/nic/nic_fd/hikp_nic_fd.c index fb9333a..3296ebf 100644 --- a/net/nic/nic_fd/hikp_nic_fd.c +++ b/net/nic/nic_fd/hikp_nic_fd.c @@ -661,7 +661,7 @@ static int hikp_nic_query_fd_rules(struct hikp_cmd_header *req_header, const str } if (rsp_head.cur_blk_entry_cnt + entry_cnt > g_fd_hw_info.alloc.stage_entry_num[stage]) { HIKP_ERROR_PRINT("The sum of entry number (%u) after block-%u " - "is over the maximum entry nubmer (%u) of this stage.", + "is over the maximum entry number (%u) of this stage.", rsp_head.cur_blk_entry_cnt + entry_cnt, idx, g_fd_hw_info.alloc.stage_entry_num[stage]); return -EINVAL; @@ -718,7 +718,7 @@ static int hikp_nic_query_fd_counter(struct hikp_cmd_header *req_header, const s } if (rsp_head.cur_blk_entry_cnt + entry_size > g_fd_hw_info.alloc.stage_counter_num[stage]) { HIKP_ERROR_PRINT("The sum of entry number (%u) after block-%u " - "is over the maximum counter nubmer (%u) of this stage.", + "is over the maximum counter number (%u) of this stage.", rsp_head.cur_blk_entry_cnt + entry_size, idx, g_fd_hw_info.alloc.stage_counter_num[stage]); return -EINVAL; -- Gitee