Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/80141/?format=api
{ "id": 80141, "url": "http://patchwork.dpdk.org/api/patches/80141/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20201009111130.10422-11-somnath.kotur@broadcom.com/", "project": { "id": 1, "url": "http://patchwork.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": "<20201009111130.10422-11-somnath.kotur@broadcom.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20201009111130.10422-11-somnath.kotur@broadcom.com", "date": "2020-10-09T11:11:27", "name": "[10/13] net/bnxt: consolidate template table processing", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "d1aff3de1d8777981a5f0f1c795da7973b8c090e", "submitter": { "id": 908, "url": "http://patchwork.dpdk.org/api/people/908/?format=api", "name": "Somnath Kotur", "email": "somnath.kotur@broadcom.com" }, "delegate": { "id": 1766, "url": "http://patchwork.dpdk.org/api/users/1766/?format=api", "username": "ajitkhaparde", "first_name": "Ajit", "last_name": "Khaparde", "email": "ajit.khaparde@broadcom.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20201009111130.10422-11-somnath.kotur@broadcom.com/mbox/", "series": [ { "id": 12818, "url": "http://patchwork.dpdk.org/api/series/12818/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=12818", "date": "2020-10-09T11:11:17", "name": "bnxt patches", "version": 1, "mbox": "http://patchwork.dpdk.org/series/12818/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/80141/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/80141/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 dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id BF40AA04BC;\n\tFri, 9 Oct 2020 13:22:54 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id BDC9F1D53B;\n\tFri, 9 Oct 2020 13:19:10 +0200 (CEST)", "from relay.smtp-ext.broadcom.com (saphodev.broadcom.com\n [192.19.232.172]) by dpdk.org (Postfix) with ESMTP id 440EE1D52E\n for <dev@dpdk.org>; Fri, 9 Oct 2020 13:19:07 +0200 (CEST)", "from dhcp-10-123-153-55.dhcp.broadcom.net\n (bgccx-dev-host-lnx35.bec.broadcom.net [10.123.153.55])\n (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\n (No client certificate requested)\n by relay.smtp-ext.broadcom.com (Postfix) with ESMTPS id 6F381829A;\n Fri, 9 Oct 2020 04:19:04 -0700 (PDT)" ], "DKIM-Filter": "OpenDKIM Filter v2.11.0 relay.smtp-ext.broadcom.com 6F381829A", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com;\n s=dkimrelay; t=1602242345;\n bh=M5FtgeznyM2Ihk5r4SP2G4q185b3j2jnPpEOizJCLp4=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=t9BlxsgiqxVBcD80JeGzSSkdemahXYXYKiYVwu/auy5YvW5sIsMxwmW+E2UwHeukp\n tZhohugADpoCyancP9id82QKDBv7B4d3HrEgHzCwT78pl4BwTFxfTTQ2pdubT5W+q/\n Anj74rbXu1OioH+l1VNhSJBakuw1PfHH7Dwx3jTI=", "From": "Somnath Kotur <somnath.kotur@broadcom.com>", "To": "dev@dpdk.org", "Cc": "ferruh.yigit@intel.com, Mike Baucom <michael.baucom@broadcom.com>,\n Ajit Kumar Khaparde <ajit.khaparde@broadcom.com>,\n Kishore Padmanabha <kishore.padmanabha@broadcom.com>", "Date": "Fri, 9 Oct 2020 16:41:27 +0530", "Message-Id": "<20201009111130.10422-11-somnath.kotur@broadcom.com>", "X-Mailer": "git-send-email 2.28.0.450.g3a238e5", "In-Reply-To": "<20201009111130.10422-1-somnath.kotur@broadcom.com>", "References": "<20201009111130.10422-1-somnath.kotur@broadcom.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH 10/13] net/bnxt: consolidate template table\n\tprocessing", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "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", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Mike Baucom <michael.baucom@broadcom.com>\n\nName changes due to consolidating the template table processing.\n\n- chip before type in name\n- removal of class in key field info\n\nSigned-off-by: Mike Baucom <michael.baucom@broadcom.com>\nReviewed-by: Ajit Kumar Khaparde <ajit.khaparde@broadcom.com>\nReviewed-by: Kishore Padmanabha <kishore.padmanabha@broadcom.com>\n---\n drivers/net/bnxt/tf_ulp/ulp_mapper.c | 12 ++++----\n .../net/bnxt/tf_ulp/ulp_template_db_stingray_act.c | 6 ++--\n .../bnxt/tf_ulp/ulp_template_db_stingray_class.c | 10 +++----\n drivers/net/bnxt/tf_ulp/ulp_template_db_tbl.c | 34 +++++++++++-----------\n drivers/net/bnxt/tf_ulp/ulp_template_db_tbl.h | 32 ++++++++++----------\n .../net/bnxt/tf_ulp/ulp_template_db_wh_plus_act.c | 6 ++--\n .../bnxt/tf_ulp/ulp_template_db_wh_plus_class.c | 10 +++----\n drivers/net/bnxt/tf_ulp/ulp_template_struct.h | 4 +--\n 8 files changed, 57 insertions(+), 57 deletions(-)", "diff": "diff --git a/drivers/net/bnxt/tf_ulp/ulp_mapper.c b/drivers/net/bnxt/tf_ulp/ulp_mapper.c\nindex 812e35c..cd289cc 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_mapper.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_mapper.c\n@@ -256,7 +256,7 @@ ulp_mapper_tbl_list_get(struct bnxt_ulp_mapper_parms *mparms,\n *\n * Returns array of Key fields, or NULL on error.\n */\n-static struct bnxt_ulp_mapper_class_key_field_info *\n+static struct bnxt_ulp_mapper_key_field_info *\n ulp_mapper_key_fields_get(struct bnxt_ulp_mapper_parms *mparms,\n \t\t\t struct bnxt_ulp_mapper_tbl_info *tbl,\n \t\t\t uint32_t *num_flds)\n@@ -1009,7 +1009,7 @@ ulp_mapper_result_field_process(struct bnxt_ulp_mapper_parms *parms,\n static int32_t\n ulp_mapper_keymask_field_process(struct bnxt_ulp_mapper_parms *parms,\n \t\t\t\t enum tf_dir dir,\n-\t\t\t\t struct bnxt_ulp_mapper_class_key_field_info *f,\n+\t\t\t\t struct bnxt_ulp_mapper_key_field_info *f,\n \t\t\t\t struct ulp_blob *blob,\n \t\t\t\t uint8_t is_key,\n \t\t\t\t const char *name)\n@@ -1020,7 +1020,7 @@ ulp_mapper_keymask_field_process(struct bnxt_ulp_mapper_parms *parms,\n \tuint8_t *operand;\n \tstruct ulp_regfile *regfile = parms->regfile;\n \tuint8_t *val = NULL;\n-\tstruct bnxt_ulp_mapper_class_key_field_info *fld = f;\n+\tstruct bnxt_ulp_mapper_key_field_info *fld = f;\n \tuint32_t field_size;\n \n \tif (is_key) {\n@@ -1442,7 +1442,7 @@ static int32_t\n ulp_mapper_tcam_tbl_process(struct bnxt_ulp_mapper_parms *parms,\n \t\t\t struct bnxt_ulp_mapper_tbl_info *tbl)\n {\n-\tstruct bnxt_ulp_mapper_class_key_field_info\t*kflds;\n+\tstruct bnxt_ulp_mapper_key_field_info\t*kflds;\n \tstruct ulp_blob key, mask, data, update_data;\n \tuint32_t i, num_kflds;\n \tstruct tf *tfp;\n@@ -1670,7 +1670,7 @@ static int32_t\n ulp_mapper_em_tbl_process(struct bnxt_ulp_mapper_parms *parms,\n \t\t\t struct bnxt_ulp_mapper_tbl_info *tbl)\n {\n-\tstruct bnxt_ulp_mapper_class_key_field_info\t*kflds;\n+\tstruct bnxt_ulp_mapper_key_field_info\t*kflds;\n \tstruct bnxt_ulp_mapper_result_field_info *dflds;\n \tstruct ulp_blob key, data;\n \tuint32_t i, num_kflds, num_dflds;\n@@ -2061,7 +2061,7 @@ static int32_t\n ulp_mapper_cache_tbl_process(struct bnxt_ulp_mapper_parms *parms,\n \t\t\t struct bnxt_ulp_mapper_tbl_info *tbl)\n {\n-\tstruct bnxt_ulp_mapper_class_key_field_info *kflds;\n+\tstruct bnxt_ulp_mapper_key_field_info *kflds;\n \tstruct bnxt_ulp_mapper_cache_entry *cache_entry;\n \tstruct bnxt_ulp_mapper_ident_info *idents;\n \tuint32_t i, num_kflds = 0, num_idents = 0;\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_stingray_act.c b/drivers/net/bnxt/tf_ulp/ulp_template_db_stingray_act.c\nindex a5019d6..68e4d8e 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_template_db_stingray_act.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_stingray_act.c\n@@ -8,7 +8,7 @@\n #include \"ulp_template_struct.h\"\n #include \"ulp_rte_parser.h\"\n \n-struct bnxt_ulp_mapper_tbl_list_info ulp_act_stingray_tmpl_list[] = {\n+struct bnxt_ulp_mapper_tbl_list_info ulp_stingray_act_tmpl_list[] = {\n \t[1] = {\n \t.device_name = BNXT_ULP_DEVICE_ID_STINGRAY,\n \t.num_tbls = 6,\n@@ -47,7 +47,7 @@ struct bnxt_ulp_mapper_tbl_list_info ulp_act_stingray_tmpl_list[] = {\n \t}\n };\n \n-struct bnxt_ulp_mapper_tbl_info ulp_act_stingray_tbl_list[] = {\n+struct bnxt_ulp_mapper_tbl_info ulp_stingray_act_tbl_list[] = {\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_ACT_STATS_64,\n@@ -531,7 +531,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_act_stingray_tbl_list[] = {\n \t}\n };\n \n-struct bnxt_ulp_mapper_result_field_info ulp_act_stingray_result_field_list[] = {\n+struct bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[] = {\n \t{\n \t.field_bit_size = 64,\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_stingray_class.c b/drivers/net/bnxt/tf_ulp/ulp_template_db_stingray_class.c\nindex b5bdb94..1fa364e 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_template_db_stingray_class.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_stingray_class.c\n@@ -8,7 +8,7 @@\n #include \"ulp_template_struct.h\"\n #include \"ulp_rte_parser.h\"\n \n-struct bnxt_ulp_mapper_tbl_list_info ulp_class_stingray_tmpl_list[] = {\n+struct bnxt_ulp_mapper_tbl_list_info ulp_stingray_class_tmpl_list[] = {\n \t[1] = {\n \t.device_name = BNXT_ULP_DEVICE_ID_STINGRAY,\n \t.num_tbls = 6,\n@@ -149,7 +149,7 @@ struct bnxt_ulp_mapper_tbl_list_info ulp_class_stingray_tmpl_list[] = {\n \t}\n };\n \n-struct bnxt_ulp_mapper_tbl_info ulp_class_stingray_tbl_list[] = {\n+struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[] = {\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,\n@@ -2349,7 +2349,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_stingray_tbl_list[] = {\n \t}\n };\n \n-struct bnxt_ulp_mapper_class_key_field_info ulp_class_stingray_key_field_list[] = {\n+struct bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[] = {\n \t{\n \t.field_bit_size = 12,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n@@ -13070,7 +13070,7 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_stingray_key_field_list[]\n \t}\n };\n \n-struct bnxt_ulp_mapper_result_field_info ulp_class_stingray_result_field_list[] = {\n+struct bnxt_ulp_mapper_result_field_info ulp_stingray_class_result_field_list[] = {\n \t{\n \t.field_bit_size = 14,\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n@@ -18750,7 +18750,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_class_stingray_result_field_list[]\n \t}\n };\n \n-struct bnxt_ulp_mapper_ident_info ulp_class_stingray_ident_list[] = {\n+struct bnxt_ulp_mapper_ident_info ulp_stingray_class_ident_list[] = {\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n \t.ident_type = TF_IDENT_TYPE_L2_CTXT_HIGH,\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_tbl.c b/drivers/net/bnxt/tf_ulp/ulp_template_db_tbl.c\nindex a677b0c..7f5a316 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_template_db_tbl.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_tbl.c\n@@ -314,31 +314,31 @@ struct bnxt_ulp_cache_tbl_params ulp_cache_tbl_params[] = {\n \n const struct ulp_template_device_tbls ulp_template_stingray_tbls[] = {\n \t[BNXT_ULP_TEMPLATE_TYPE_CLASS] = {\n-\t.tmpl_list = ulp_class_stingray_tmpl_list,\n-\t.tbl_list = ulp_class_stingray_tbl_list,\n-\t.key_field_list = ulp_class_stingray_key_field_list,\n-\t.result_field_list = ulp_class_stingray_result_field_list,\n-\t.ident_list = ulp_class_stingray_ident_list\n+\t.tmpl_list = ulp_stingray_class_tmpl_list,\n+\t.tbl_list = ulp_stingray_class_tbl_list,\n+\t.key_field_list = ulp_stingray_class_key_field_list,\n+\t.result_field_list = ulp_stingray_class_result_field_list,\n+\t.ident_list = ulp_stingray_class_ident_list\n \t},\n \t[BNXT_ULP_TEMPLATE_TYPE_ACTION] = {\n-\t.tmpl_list = ulp_act_stingray_tmpl_list,\n-\t.tbl_list = ulp_act_stingray_tbl_list,\n-\t.result_field_list = ulp_act_stingray_result_field_list\n+\t.tmpl_list = ulp_stingray_act_tmpl_list,\n+\t.tbl_list = ulp_stingray_act_tbl_list,\n+\t.result_field_list = ulp_stingray_act_result_field_list\n \t}\n };\n \n const struct ulp_template_device_tbls ulp_template_wh_plus_tbls[] = {\n \t[BNXT_ULP_TEMPLATE_TYPE_CLASS] = {\n-\t.tmpl_list = ulp_class_wh_plus_tmpl_list,\n-\t.tbl_list = ulp_class_wh_plus_tbl_list,\n-\t.key_field_list = ulp_class_wh_plus_key_field_list,\n-\t.result_field_list = ulp_class_wh_plus_result_field_list,\n-\t.ident_list = ulp_class_wh_plus_ident_list\n+\t.tmpl_list = ulp_wh_plus_class_tmpl_list,\n+\t.tbl_list = ulp_wh_plus_class_tbl_list,\n+\t.key_field_list = ulp_wh_plus_class_key_field_list,\n+\t.result_field_list = ulp_wh_plus_class_result_field_list,\n+\t.ident_list = ulp_wh_plus_class_ident_list\n \t},\n \t[BNXT_ULP_TEMPLATE_TYPE_ACTION] = {\n-\t.tmpl_list = ulp_act_wh_plus_tmpl_list,\n-\t.tbl_list = ulp_act_wh_plus_tbl_list,\n-\t.result_field_list = ulp_act_wh_plus_result_field_list\n+\t.tmpl_list = ulp_wh_plus_act_tmpl_list,\n+\t.tbl_list = ulp_wh_plus_act_tbl_list,\n+\t.result_field_list = ulp_wh_plus_act_result_field_list\n \t}\n };\n \n@@ -351,6 +351,7 @@ struct bnxt_ulp_device_params ulp_device_params[BNXT_ULP_DEVICE_ID_LAST] = {\n \t.mark_db_lfid_entries = 65536,\n \t.mark_db_gfid_entries = 65536,\n \t.flow_count_db_entries = 16384,\n+\t.fdb_parent_flow_entries = 2,\n \t.num_resources_per_flow = 8,\n \t.num_phy_ports = 2,\n \t.ext_cntr_table_type = 0,\n@@ -368,7 +369,6 @@ struct bnxt_ulp_device_params ulp_device_params[BNXT_ULP_DEVICE_ID_LAST] = {\n \t.mark_db_lfid_entries = 65536,\n \t.mark_db_gfid_entries = 65536,\n \t.flow_count_db_entries = 16384,\n-\t.fdb_parent_flow_entries = 2,\n \t.num_resources_per_flow = 8,\n \t.num_phy_ports = 2,\n \t.ext_cntr_table_type = 0,\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_tbl.h b/drivers/net/bnxt/tf_ulp/ulp_template_db_tbl.h\nindex 7a541cb..8c13ca3 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_template_db_tbl.h\n+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_tbl.h\n@@ -8,41 +8,41 @@\n \n #include \"ulp_template_struct.h\"\n \n-extern struct bnxt_ulp_mapper_tbl_list_info ulp_class_wh_plus_tmpl_list[];\n+extern struct bnxt_ulp_mapper_tbl_list_info ulp_wh_plus_class_tmpl_list[];\n \n-extern struct bnxt_ulp_mapper_tbl_info ulp_class_wh_plus_tbl_list[];\n+extern struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[];\n \n extern struct\n-bnxt_ulp_mapper_class_key_field_info ulp_class_wh_plus_key_field_list[];\n+bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[];\n \n extern struct\n-bnxt_ulp_mapper_result_field_info ulp_class_wh_plus_result_field_list[];\n+bnxt_ulp_mapper_result_field_info ulp_wh_plus_class_result_field_list[];\n \n-extern struct bnxt_ulp_mapper_ident_info ulp_class_wh_plus_ident_list[];\n+extern struct bnxt_ulp_mapper_ident_info ulp_wh_plus_class_ident_list[];\n \n-extern struct bnxt_ulp_mapper_tbl_list_info ulp_act_wh_plus_tmpl_list[];\n+extern struct bnxt_ulp_mapper_tbl_list_info ulp_wh_plus_act_tmpl_list[];\n \n-extern struct bnxt_ulp_mapper_tbl_info ulp_act_wh_plus_tbl_list[];\n+extern struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[];\n \n extern struct\n-bnxt_ulp_mapper_result_field_info ulp_act_wh_plus_result_field_list[];\n+bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[];\n \n-extern struct bnxt_ulp_mapper_tbl_list_info ulp_class_stingray_tmpl_list[];\n+extern struct bnxt_ulp_mapper_tbl_list_info ulp_stingray_class_tmpl_list[];\n \n-extern struct bnxt_ulp_mapper_tbl_info ulp_class_stingray_tbl_list[];\n+extern struct bnxt_ulp_mapper_tbl_info ulp_stingray_class_tbl_list[];\n \n extern struct\n-bnxt_ulp_mapper_class_key_field_info ulp_class_stingray_key_field_list[];\n+bnxt_ulp_mapper_key_field_info ulp_stingray_class_key_field_list[];\n \n extern struct\n-bnxt_ulp_mapper_result_field_info ulp_class_stingray_result_field_list[];\n+bnxt_ulp_mapper_result_field_info ulp_stingray_class_result_field_list[];\n \n-extern struct bnxt_ulp_mapper_ident_info ulp_class_stingray_ident_list[];\n+extern struct bnxt_ulp_mapper_ident_info ulp_stingray_class_ident_list[];\n \n-extern struct bnxt_ulp_mapper_tbl_list_info ulp_act_stingray_tmpl_list[];\n+extern struct bnxt_ulp_mapper_tbl_list_info ulp_stingray_act_tmpl_list[];\n \n-extern struct bnxt_ulp_mapper_tbl_info ulp_act_stingray_tbl_list[];\n+extern struct bnxt_ulp_mapper_tbl_info ulp_stingray_act_tbl_list[];\n \n extern struct\n-bnxt_ulp_mapper_result_field_info ulp_act_stingray_result_field_list[];\n+bnxt_ulp_mapper_result_field_info ulp_stingray_act_result_field_list[];\n #endif\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_wh_plus_act.c b/drivers/net/bnxt/tf_ulp/ulp_template_db_wh_plus_act.c\nindex 82b2ad9..381278e 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_template_db_wh_plus_act.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_wh_plus_act.c\n@@ -8,7 +8,7 @@\n #include \"ulp_template_struct.h\"\n #include \"ulp_rte_parser.h\"\n \n-struct bnxt_ulp_mapper_tbl_list_info ulp_act_wh_plus_tmpl_list[] = {\n+struct bnxt_ulp_mapper_tbl_list_info ulp_wh_plus_act_tmpl_list[] = {\n \t[1] = {\n \t.device_name = BNXT_ULP_DEVICE_ID_WH_PLUS,\n \t.num_tbls = 6,\n@@ -47,7 +47,7 @@ struct bnxt_ulp_mapper_tbl_list_info ulp_act_wh_plus_tmpl_list[] = {\n \t}\n };\n \n-struct bnxt_ulp_mapper_tbl_info ulp_act_wh_plus_tbl_list[] = {\n+struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_ACT_STATS_64,\n@@ -530,7 +530,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_act_wh_plus_tbl_list[] = {\n \t}\n };\n \n-struct bnxt_ulp_mapper_result_field_info ulp_act_wh_plus_result_field_list[] = {\n+struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_act_result_field_list[] = {\n \t{\n \t.field_bit_size = 64,\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_wh_plus_class.c b/drivers/net/bnxt/tf_ulp/ulp_template_db_wh_plus_class.c\nindex 9f40b39..7024658 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_template_db_wh_plus_class.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_wh_plus_class.c\n@@ -8,7 +8,7 @@\n #include \"ulp_template_struct.h\"\n #include \"ulp_rte_parser.h\"\n \n-struct bnxt_ulp_mapper_tbl_list_info ulp_class_wh_plus_tmpl_list[] = {\n+struct bnxt_ulp_mapper_tbl_list_info ulp_wh_plus_class_tmpl_list[] = {\n \t[1] = {\n \t.device_name = BNXT_ULP_DEVICE_ID_WH_PLUS,\n \t.num_tbls = 6,\n@@ -149,7 +149,7 @@ struct bnxt_ulp_mapper_tbl_list_info ulp_class_wh_plus_tmpl_list[] = {\n \t}\n };\n \n-struct bnxt_ulp_mapper_tbl_info ulp_class_wh_plus_tbl_list[] = {\n+struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,\n@@ -2349,7 +2349,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_wh_plus_tbl_list[] = {\n \t}\n };\n \n-struct bnxt_ulp_mapper_class_key_field_info ulp_class_wh_plus_key_field_list[] = {\n+struct bnxt_ulp_mapper_key_field_info ulp_wh_plus_class_key_field_list[] = {\n \t{\n \t.field_bit_size = 8,\n \t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO,\n@@ -13070,7 +13070,7 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_wh_plus_key_field_list[] =\n \t}\n };\n \n-struct bnxt_ulp_mapper_result_field_info ulp_class_wh_plus_result_field_list[] = {\n+struct bnxt_ulp_mapper_result_field_info ulp_wh_plus_class_result_field_list[] = {\n \t{\n \t.field_bit_size = 14,\n \t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ZERO\n@@ -18750,7 +18750,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_class_wh_plus_result_field_list[] =\n \t}\n };\n \n-struct bnxt_ulp_mapper_ident_info ulp_class_wh_plus_ident_list[] = {\n+struct bnxt_ulp_mapper_ident_info ulp_wh_plus_class_ident_list[] = {\n \t{\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n \t.ident_type = TF_IDENT_TYPE_L2_CTXT_HIGH,\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_template_struct.h b/drivers/net/bnxt/tf_ulp/ulp_template_struct.h\nindex 2e94b6f..107a06a 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_template_struct.h\n+++ b/drivers/net/bnxt/tf_ulp/ulp_template_struct.h\n@@ -144,7 +144,7 @@ extern struct bnxt_ulp_act_match_info ulp_act_match_list[];\n struct ulp_template_device_tbls {\n \tstruct bnxt_ulp_mapper_tbl_list_info *tmpl_list;\n \tstruct bnxt_ulp_mapper_tbl_info *tbl_list;\n-\tstruct bnxt_ulp_mapper_class_key_field_info *key_field_list;\n+\tstruct bnxt_ulp_mapper_key_field_info *key_field_list;\n \tstruct bnxt_ulp_mapper_result_field_info *result_field_list;\n \tstruct bnxt_ulp_mapper_ident_info *ident_list;\n };\n@@ -212,7 +212,7 @@ struct bnxt_ulp_mapper_tbl_info {\n \tuint32_t\t\t\tindex_operand;\n };\n \n-struct bnxt_ulp_mapper_class_key_field_info {\n+struct bnxt_ulp_mapper_key_field_info {\n \tuint8_t\t\t\t\tdescription[64];\n \tenum bnxt_ulp_mapper_opc\tmask_opcode;\n \tenum bnxt_ulp_mapper_opc\tspec_opcode;\n", "prefixes": [ "10/13" ] }