Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/115872/?format=api
{ "id": 115872, "url": "http://patches.dpdk.org/api/patches/115872/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20220905085939.22236-3-liudongdong3@huawei.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20220905085939.22236-3-liudongdong3@huawei.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20220905085939.22236-3-liudongdong3@huawei.com", "date": "2022-09-05T08:59:28", "name": "[RESEND,02/13] net/hns3: fix code check warning", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "052c2a6f215dcec436c4f46d75726ef8eec57e5c", "submitter": { "id": 2718, "url": "http://patches.dpdk.org/api/people/2718/?format=api", "name": "Dongdong Liu", "email": "liudongdong3@huawei.com" }, "delegate": { "id": 3961, "url": "http://patches.dpdk.org/api/users/3961/?format=api", "username": "arybchenko", "first_name": "Andrew", "last_name": "Rybchenko", "email": "andrew.rybchenko@oktetlabs.ru" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20220905085939.22236-3-liudongdong3@huawei.com/mbox/", "series": [ { "id": 24533, "url": "http://patches.dpdk.org/api/series/24533/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=24533", "date": "2022-09-05T08:59:26", "name": "some bugfixes and clean code for hns3", "version": 1, "mbox": "http://patches.dpdk.org/series/24533/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/115872/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/115872/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 8A768A054A;\n\tMon, 5 Sep 2022 11:01:15 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 101AE4282B;\n\tMon, 5 Sep 2022 11:01:06 +0200 (CEST)", "from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187])\n by mails.dpdk.org (Postfix) with ESMTP id 4914C40697;\n Mon, 5 Sep 2022 11:01:02 +0200 (CEST)", "from kwepemi500017.china.huawei.com (unknown [172.30.72.55])\n by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4MLj7t5vCvzkX0X;\n Mon, 5 Sep 2022 16:57:14 +0800 (CST)", "from localhost.localdomain (10.28.79.22) by\n kwepemi500017.china.huawei.com (7.221.188.110) with Microsoft SMTP Server\n (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id\n 15.1.2375.24; Mon, 5 Sep 2022 17:01:00 +0800" ], "From": "Dongdong Liu <liudongdong3@huawei.com>", "To": "<dev@dpdk.org>, <andrew.rybchenko@oktetlabs.ru>,\n <ferruh.yigit@xilinx.com>, <thomas@monjalon.net>, <liudongdong3@huawei.com>,\n <lihuisong@huawei.com>, <haijie1@huawei.com>", "CC": "<stable@dpdk.org>, <fengchengwen@huawei.com>, <yisen.zhuang@huawei.com>,\n <humin29@huawei.com>", "Subject": "[PATCH RESEND 02/13] net/hns3: fix code check warning", "Date": "Mon, 5 Sep 2022 16:59:28 +0800", "Message-ID": "<20220905085939.22236-3-liudongdong3@huawei.com>", "X-Mailer": "git-send-email 2.22.0", "In-Reply-To": "<20220905085939.22236-1-liudongdong3@huawei.com>", "References": "<20220905085939.22236-1-liudongdong3@huawei.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Originating-IP": "[10.28.79.22]", "X-ClientProxiedBy": "dggems701-chm.china.huawei.com (10.3.19.178) To\n kwepemi500017.china.huawei.com (7.221.188.110)", "X-CFilter-Loop": "Reflected", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "From: \"Min Hu (Connor)\" <humin29@huawei.com>\n\nThis patch fixed code check warning according to this:\nfunction should have same name with previous declaration.\nlocal variable should no be referenced in macro referenced.\nmacro argument 'adapter' should be enclosed in parentheses.\n\nSigned-off-by: Min Hu (Connor) <humin29@huawei.com>\nSigned-off-by: Dongdong Liu <liudongdong3@huawei.com>\n---\n drivers/net/hns3/hns3_common.c | 4 ++--\n drivers/net/hns3/hns3_dump.c | 4 ++--\n drivers/net/hns3/hns3_ethdev.h | 14 +++++++-------\n drivers/net/hns3/hns3_flow.c | 4 ++--\n drivers/net/hns3/hns3_intr.c | 27 ++++++++++++---------------\n drivers/net/hns3/hns3_intr.h | 4 ++--\n drivers/net/hns3/hns3_regs.c | 4 ++--\n drivers/net/hns3/hns3_rss.c | 2 +-\n drivers/net/hns3/hns3_rss.h | 2 +-\n drivers/net/hns3/hns3_rxtx.c | 4 ++--\n drivers/net/hns3/hns3_rxtx.h | 14 +++++++++-----\n drivers/net/hns3/hns3_stats.h | 5 +++--\n 12 files changed, 45 insertions(+), 43 deletions(-)", "diff": "diff --git a/drivers/net/hns3/hns3_common.c b/drivers/net/hns3/hns3_common.c\nindex 424205356e..d8605204a6 100644\n--- a/drivers/net/hns3/hns3_common.c\n+++ b/drivers/net/hns3/hns3_common.c\n@@ -493,7 +493,7 @@ hns3_configure_all_mac_addr(struct hns3_adapter *hns, bool del)\n \t\tif (ret) {\n \t\t\thns3_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,\n \t\t\t\t\t addr);\n-\t\t\thns3_err(hw, \"failed to %s mac addr(%s) index:%d ret = %d.\",\n+\t\t\thns3_err(hw, \"failed to %s mac addr(%s) index:%u ret = %d.\",\n \t\t\t\t del ? \"remove\" : \"restore\", mac_str, i, ret);\n \t\t}\n \t}\n@@ -680,7 +680,7 @@ hns3_init_ring_with_vector(struct hns3_hw *hw)\n \t\tret = hw->ops.bind_ring_with_vector(hw, vec, false,\n \t\t\t\t\t\t HNS3_RING_TYPE_TX, i);\n \t\tif (ret) {\n-\t\t\tPMD_INIT_LOG(ERR, \"fail to unbind TX ring(%d) with vector: %u, ret=%d\",\n+\t\t\tPMD_INIT_LOG(ERR, \"fail to unbind TX ring(%u) with vector: %u, ret=%d\",\n \t\t\t\t i, vec, ret);\n \t\t\treturn ret;\n \t\t}\ndiff --git a/drivers/net/hns3/hns3_dump.c b/drivers/net/hns3/hns3_dump.c\nindex 2cfab429af..1738d3cd4e 100644\n--- a/drivers/net/hns3/hns3_dump.c\n+++ b/drivers/net/hns3/hns3_dump.c\n@@ -342,7 +342,7 @@ static void\n print_queue_state_perline(FILE *file, const uint32_t *queue_state,\n \t\t\t uint32_t nb_queues, uint32_t line_num)\n {\n-#define NUM_QUEUE_PER_LINE (sizeof(*queue_state) * CHAR_BIT)\n+#define NUM_QUEUE_PER_LINE (sizeof(uint32_t) * HNS3_UINT8_BIT)\n \tuint32_t qid = line_num * NUM_QUEUE_PER_LINE;\n \tuint32_t j;\n \n@@ -365,7 +365,7 @@ static void\n display_queue_enable_state(FILE *file, const uint32_t *queue_state,\n \t\t\t uint32_t nb_queues, bool is_rxq)\n {\n-#define NUM_QUEUE_PER_LINE (sizeof(*queue_state) * CHAR_BIT)\n+#define NUM_QUEUE_PER_LINE (sizeof(uint32_t) * HNS3_UINT8_BIT)\n \tuint32_t i;\n \n \tif (nb_queues == 0) {\ndiff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h\nindex 8de5a712f4..bd5fc689f8 100644\n--- a/drivers/net/hns3/hns3_ethdev.h\n+++ b/drivers/net/hns3/hns3_ethdev.h\n@@ -898,11 +898,11 @@ enum hns3_dev_cap {\n \thns3_get_bit((hw)->capability, HNS3_DEV_SUPPORT_##_name##_B)\n \n #define HNS3_DEV_PRIVATE_TO_HW(adapter) \\\n-\t(&((struct hns3_adapter *)adapter)->hw)\n+\t(&((struct hns3_adapter *)(adapter))->hw)\n #define HNS3_DEV_PRIVATE_TO_PF(adapter) \\\n-\t(&((struct hns3_adapter *)adapter)->pf)\n+\t(&((struct hns3_adapter *)(adapter))->pf)\n #define HNS3_DEV_PRIVATE_TO_VF(adapter) \\\n-\t(&((struct hns3_adapter *)adapter)->vf)\n+\t(&((struct hns3_adapter *)(adapter))->vf)\n #define HNS3_DEV_HW_TO_ADAPTER(hw) \\\n \tcontainer_of(hw, struct hns3_adapter, hw)\n \n@@ -999,10 +999,10 @@ static inline uint32_t hns3_read_reg(void *base, uint32_t reg)\n \n #define NEXT_ITEM_OF_ACTION(act, actions, index) \\\n \tdo {\t\t\t\t\t\t\t\t\\\n-\t\tact = (actions) + (index);\t\t\t\t\\\n-\t\twhile (act->type == RTE_FLOW_ACTION_TYPE_VOID) {\t\\\n+\t\t(act) = (actions) + (index);\t\t\t\t\\\n+\t\twhile ((act)->type == RTE_FLOW_ACTION_TYPE_VOID) {\t\\\n \t\t\t(index)++;\t\t\t\t\t\\\n-\t\t\tact = actions + index;\t\t\t\t\\\n+\t\t\t(act) = (actions) + (index);\t\t\t\t\\\n \t\t}\t\t\t\t\t\t\t\\\n \t} while (0)\n \n@@ -1027,7 +1027,7 @@ hns3_atomic_clear_bit(unsigned int nr, volatile uint64_t *addr)\n \t__atomic_fetch_and(addr, ~(1UL << nr), __ATOMIC_RELAXED);\n }\n \n-static inline int64_t\n+static inline uint64_t\n hns3_test_and_clear_bit(unsigned int nr, volatile uint64_t *addr)\n {\n \tuint64_t mask = (1UL << nr);\ndiff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c\nindex fb9354fe7f..b84f26c26c 100644\n--- a/drivers/net/hns3/hns3_flow.c\n+++ b/drivers/net/hns3/hns3_flow.c\n@@ -66,7 +66,7 @@ static enum rte_flow_item_type tunnel_next_items[] = {\n \n struct items_step_mngr {\n \tenum rte_flow_item_type *items;\n-\tint count;\n+\tsize_t count;\n };\n \n static inline void\n@@ -1141,7 +1141,7 @@ hns3_validate_item(const struct rte_flow_item *item,\n \t\t struct items_step_mngr step_mngr,\n \t\t struct rte_flow_error *error)\n {\n-\tint i;\n+\tuint32_t i;\n \n \tif (item->last)\n \t\treturn rte_flow_error_set(error, ENOTSUP,\ndiff --git a/drivers/net/hns3/hns3_intr.c b/drivers/net/hns3/hns3_intr.c\nindex 3ca2e1e338..4bdcd6070b 100644\n--- a/drivers/net/hns3/hns3_intr.c\n+++ b/drivers/net/hns3/hns3_intr.c\n@@ -16,12 +16,6 @@\n \n #define SWITCH_CONTEXT_US\t10\n \n-#define HNS3_CHECK_MERGE_CNT(val)\t\t\t\\\n-\tdo {\t\t\t\t\t\t\\\n-\t\tif (val)\t\t\t\t\\\n-\t\t\thw->reset.stats.merge_cnt++;\t\\\n-\t} while (0)\n-\n static const char *reset_string[HNS3_MAX_RESET] = {\n \t\"flr\", \"vf_func\", \"vf_pf_func\", \"vf_full\", \"vf_global\",\n \t\"pf_func\", \"global\", \"IMP\", \"none\",\n@@ -2525,20 +2519,20 @@ static void\n hns3_clear_reset_level(struct hns3_hw *hw, uint64_t *levels)\n {\n \tuint64_t merge_cnt = hw->reset.stats.merge_cnt;\n-\tint64_t tmp;\n+\tuint64_t tmp;\n \n \tswitch (hw->reset.level) {\n \tcase HNS3_IMP_RESET:\n \t\thns3_atomic_clear_bit(HNS3_IMP_RESET, levels);\n \t\ttmp = hns3_test_and_clear_bit(HNS3_GLOBAL_RESET, levels);\n-\t\tHNS3_CHECK_MERGE_CNT(tmp);\n+\t\tmerge_cnt = tmp > 0 ? merge_cnt + 1 : merge_cnt;\n \t\ttmp = hns3_test_and_clear_bit(HNS3_FUNC_RESET, levels);\n-\t\tHNS3_CHECK_MERGE_CNT(tmp);\n+\t\tmerge_cnt = tmp > 0 ? merge_cnt + 1 : merge_cnt;\n \t\tbreak;\n \tcase HNS3_GLOBAL_RESET:\n \t\thns3_atomic_clear_bit(HNS3_GLOBAL_RESET, levels);\n \t\ttmp = hns3_test_and_clear_bit(HNS3_FUNC_RESET, levels);\n-\t\tHNS3_CHECK_MERGE_CNT(tmp);\n+\t\tmerge_cnt = tmp > 0 ? merge_cnt + 1 : merge_cnt;\n \t\tbreak;\n \tcase HNS3_FUNC_RESET:\n \t\thns3_atomic_clear_bit(HNS3_FUNC_RESET, levels);\n@@ -2546,19 +2540,19 @@ hns3_clear_reset_level(struct hns3_hw *hw, uint64_t *levels)\n \tcase HNS3_VF_RESET:\n \t\thns3_atomic_clear_bit(HNS3_VF_RESET, levels);\n \t\ttmp = hns3_test_and_clear_bit(HNS3_VF_PF_FUNC_RESET, levels);\n-\t\tHNS3_CHECK_MERGE_CNT(tmp);\n+\t\tmerge_cnt = tmp > 0 ? merge_cnt + 1 : merge_cnt;\n \t\ttmp = hns3_test_and_clear_bit(HNS3_VF_FUNC_RESET, levels);\n-\t\tHNS3_CHECK_MERGE_CNT(tmp);\n+\t\tmerge_cnt = tmp > 0 ? merge_cnt + 1 : merge_cnt;\n \t\tbreak;\n \tcase HNS3_VF_FULL_RESET:\n \t\thns3_atomic_clear_bit(HNS3_VF_FULL_RESET, levels);\n \t\ttmp = hns3_test_and_clear_bit(HNS3_VF_FUNC_RESET, levels);\n-\t\tHNS3_CHECK_MERGE_CNT(tmp);\n+\t\tmerge_cnt = tmp > 0 ? merge_cnt + 1 : merge_cnt;\n \t\tbreak;\n \tcase HNS3_VF_PF_FUNC_RESET:\n \t\thns3_atomic_clear_bit(HNS3_VF_PF_FUNC_RESET, levels);\n \t\ttmp = hns3_test_and_clear_bit(HNS3_VF_FUNC_RESET, levels);\n-\t\tHNS3_CHECK_MERGE_CNT(tmp);\n+\t\tmerge_cnt = tmp > 0 ? merge_cnt + 1 : merge_cnt;\n \t\tbreak;\n \tcase HNS3_VF_FUNC_RESET:\n \t\thns3_atomic_clear_bit(HNS3_VF_FUNC_RESET, levels);\n@@ -2570,13 +2564,16 @@ hns3_clear_reset_level(struct hns3_hw *hw, uint64_t *levels)\n \tdefault:\n \t\treturn;\n \t};\n-\tif (merge_cnt != hw->reset.stats.merge_cnt)\n+\n+\tif (merge_cnt != hw->reset.stats.merge_cnt) {\n \t\thns3_warn(hw,\n \t\t\t \"No need to do low-level reset after %s reset. \"\n \t\t\t \"merge cnt: %\" PRIu64 \" total merge cnt: %\" PRIu64,\n \t\t\t reset_string[hw->reset.level],\n \t\t\t hw->reset.stats.merge_cnt - merge_cnt,\n \t\t\t hw->reset.stats.merge_cnt);\n+\t\thw->reset.stats.merge_cnt = merge_cnt;\n+\t}\n }\n \n static bool\ndiff --git a/drivers/net/hns3/hns3_intr.h b/drivers/net/hns3/hns3_intr.h\nindex 1a0f196614..1490a5e387 100644\n--- a/drivers/net/hns3/hns3_intr.h\n+++ b/drivers/net/hns3/hns3_intr.h\n@@ -170,7 +170,7 @@ struct hns3_hw_error_desc {\n \tconst struct hns3_hw_error *hw_err;\n };\n \n-int hns3_enable_hw_error_intr(struct hns3_adapter *hns, bool state);\n+int hns3_enable_hw_error_intr(struct hns3_adapter *hns, bool en);\n void hns3_handle_msix_error(struct hns3_adapter *hns, uint64_t *levels);\n void hns3_handle_ras_error(struct hns3_adapter *hns, uint64_t *levels);\n void hns3_config_mac_tnl_int(struct hns3_hw *hw, bool en);\n@@ -185,7 +185,7 @@ void hns3_schedule_reset(struct hns3_adapter *hns);\n void hns3_schedule_delayed_reset(struct hns3_adapter *hns);\n int hns3_reset_req_hw_reset(struct hns3_adapter *hns);\n int hns3_reset_process(struct hns3_adapter *hns,\n-\t\t enum hns3_reset_level reset_level);\n+\t\t enum hns3_reset_level new_level);\n void hns3_reset_abort(struct hns3_adapter *hns);\n void hns3_start_report_lse(struct rte_eth_dev *dev);\n void hns3_stop_report_lse(struct rte_eth_dev *dev);\ndiff --git a/drivers/net/hns3/hns3_regs.c b/drivers/net/hns3/hns3_regs.c\nindex 6778e4cfc2..33392fd1f0 100644\n--- a/drivers/net/hns3/hns3_regs.c\n+++ b/drivers/net/hns3/hns3_regs.c\n@@ -15,7 +15,7 @@\n #define REG_NUM_PER_LINE\t4\n #define REG_LEN_PER_LINE\t(REG_NUM_PER_LINE * sizeof(uint32_t))\n \n-static int hns3_get_dfx_reg_line(struct hns3_hw *hw, uint32_t *length);\n+static int hns3_get_dfx_reg_line(struct hns3_hw *hw, uint32_t *lines);\n \n static const uint32_t cmdq_reg_addrs[] = {HNS3_CMDQ_TX_ADDR_L_REG,\n \t\t\t\t\t HNS3_CMDQ_TX_ADDR_H_REG,\n@@ -295,7 +295,7 @@ hns3_direct_access_regs(struct hns3_hw *hw, uint32_t *data)\n \tuint32_t *origin_data_ptr = data;\n \tuint32_t reg_offset;\n \tuint16_t i, j;\n-\tint reg_num;\n+\tsize_t reg_num;\n \n \t/* fetching per-PF registers values from PF PCIe register space */\n \treg_num = sizeof(cmdq_reg_addrs) / sizeof(uint32_t);\ndiff --git a/drivers/net/hns3/hns3_rss.c b/drivers/net/hns3/hns3_rss.c\nindex 1003daf03e..fc912ed2e8 100644\n--- a/drivers/net/hns3/hns3_rss.c\n+++ b/drivers/net/hns3/hns3_rss.c\n@@ -10,7 +10,7 @@\n #include \"hns3_logs.h\"\n \n /* Default hash keys */\n-const uint8_t hns3_hash_key[] = {\n+const uint8_t hns3_hash_key[HNS3_RSS_KEY_SIZE] = {\n \t0x6D, 0x5A, 0x56, 0xDA, 0x25, 0x5B, 0x0E, 0xC2,\n \t0x41, 0x67, 0x25, 0x3D, 0x43, 0xA3, 0x8F, 0xB0,\n \t0xD0, 0xCA, 0x2B, 0xCB, 0xAE, 0x7B, 0x30, 0xB4,\ndiff --git a/drivers/net/hns3/hns3_rss.h b/drivers/net/hns3/hns3_rss.h\nindex 56627cbd4c..39af01ef13 100644\n--- a/drivers/net/hns3/hns3_rss.h\n+++ b/drivers/net/hns3/hns3_rss.h\n@@ -88,7 +88,7 @@ static inline uint32_t roundup_pow_of_two(uint32_t x)\n \treturn 1UL << fls(x - 1);\n }\n \n-extern const uint8_t hns3_hash_key[];\n+extern const uint8_t hns3_hash_key[HNS3_RSS_KEY_SIZE];\n \n struct hns3_adapter;\n \ndiff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c\nindex 95f711e7eb..731f1bc0ef 100644\n--- a/drivers/net/hns3/hns3_rxtx.c\n+++ b/drivers/net/hns3/hns3_rxtx.c\n@@ -2759,7 +2759,7 @@ hns3_rx_check_vec_support(__rte_unused struct rte_eth_dev *dev)\n }\n \n uint16_t __rte_weak\n-hns3_recv_pkts_vec(__rte_unused void *tx_queue,\n+hns3_recv_pkts_vec(__rte_unused void *rx_queue,\n \t\t __rte_unused struct rte_mbuf **rx_pkts,\n \t\t __rte_unused uint16_t nb_pkts)\n {\n@@ -2767,7 +2767,7 @@ hns3_recv_pkts_vec(__rte_unused void *tx_queue,\n }\n \n uint16_t __rte_weak\n-hns3_recv_pkts_vec_sve(__rte_unused void *tx_queue,\n+hns3_recv_pkts_vec_sve(__rte_unused void *rx_queue,\n \t\t __rte_unused struct rte_mbuf **rx_pkts,\n \t\t __rte_unused uint16_t nb_pkts)\n {\ndiff --git a/drivers/net/hns3/hns3_rxtx.h b/drivers/net/hns3/hns3_rxtx.h\nindex 62efc854e4..455f8b9419 100644\n--- a/drivers/net/hns3/hns3_rxtx.h\n+++ b/drivers/net/hns3/hns3_rxtx.h\n@@ -691,10 +691,12 @@ int hns3_rxq_iterate(struct rte_eth_dev *dev,\n \t\t int (*callback)(struct hns3_rx_queue *, void *), void *arg);\n void hns3_dev_release_mbufs(struct hns3_adapter *hns);\n int hns3_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t nb_desc,\n-\t\t\tunsigned int socket, const struct rte_eth_rxconf *conf,\n+\t\t\tunsigned int socket_id,\n+\t\t\tconst struct rte_eth_rxconf *conf,\n \t\t\tstruct rte_mempool *mp);\n int hns3_tx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t nb_desc,\n-\t\t\tunsigned int socket, const struct rte_eth_txconf *conf);\n+\t\t\tunsigned int socket_id,\n+\t\t\tconst struct rte_eth_txconf *conf);\n uint32_t hns3_rx_queue_count(void *rx_queue);\n int hns3_dev_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id);\n int hns3_dev_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id);\n@@ -704,9 +706,11 @@ uint16_t hns3_recv_pkts_simple(void *rx_queue, struct rte_mbuf **rx_pkts,\n \t\t\t\tuint16_t nb_pkts);\n uint16_t hns3_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,\n \t\t\t\t uint16_t nb_pkts);\n-uint16_t hns3_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts,\n+uint16_t hns3_recv_pkts_vec(void *__restrict rx_queue,\n+\t\t\t struct rte_mbuf **__restrict rx_pkts,\n \t\t\t uint16_t nb_pkts);\n-uint16_t hns3_recv_pkts_vec_sve(void *rx_queue, struct rte_mbuf **rx_pkts,\n+uint16_t hns3_recv_pkts_vec_sve(void *__restrict rx_queue,\n+\t\t\t\tstruct rte_mbuf **__restrict rx_pkts,\n \t\t\t\tuint16_t nb_pkts);\n int hns3_rx_burst_mode_get(struct rte_eth_dev *dev,\n \t\t\t __rte_unused uint16_t queue_id,\n@@ -751,7 +755,7 @@ void hns3_rxq_info_get(struct rte_eth_dev *dev, uint16_t queue_id,\n \t\t struct rte_eth_rxq_info *qinfo);\n void hns3_txq_info_get(struct rte_eth_dev *dev, uint16_t queue_id,\n \t\t struct rte_eth_txq_info *qinfo);\n-uint32_t hns3_get_tqp_reg_offset(uint16_t idx);\n+uint32_t hns3_get_tqp_reg_offset(uint16_t queue_id);\n int hns3_start_all_txqs(struct rte_eth_dev *dev);\n int hns3_start_all_rxqs(struct rte_eth_dev *dev);\n void hns3_stop_all_txqs(struct rte_eth_dev *dev);\ndiff --git a/drivers/net/hns3/hns3_stats.h b/drivers/net/hns3/hns3_stats.h\nindex b5cd6188b4..9d84072205 100644\n--- a/drivers/net/hns3/hns3_stats.h\n+++ b/drivers/net/hns3/hns3_stats.h\n@@ -145,7 +145,8 @@ struct hns3_reset_stats;\n #define HNS3_IMISSED_STATS_FIELD_OFFSET(f) \\\n \t(offsetof(struct hns3_rx_missed_stats, f))\n \n-int hns3_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *rte_stats);\n+int hns3_stats_get(struct rte_eth_dev *eth_dev,\n+\t\t struct rte_eth_stats *rte_stats);\n int hns3_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats,\n \t\t\tunsigned int n);\n int hns3_dev_xstats_reset(struct rte_eth_dev *dev);\n@@ -160,7 +161,7 @@ int hns3_dev_xstats_get_names_by_id(struct rte_eth_dev *dev,\n \t\t\t\t const uint64_t *ids,\n \t\t\t\t struct rte_eth_xstat_name *xstats_names,\n \t\t\t\t uint32_t size);\n-int hns3_stats_reset(struct rte_eth_dev *dev);\n+int hns3_stats_reset(struct rte_eth_dev *eth_dev);\n int hns3_stats_init(struct hns3_hw *hw);\n void hns3_stats_uninit(struct hns3_hw *hw);\n int hns3_query_mac_stats_reg_num(struct hns3_hw *hw);\n", "prefixes": [ "RESEND", "02/13" ] }