Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/93593/?format=api
{ "id": 93593, "url": "http://patches.dpdk.org/api/patches/93593/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20210530085929.29695-53-venkatkumar.duvvuru@broadcom.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": "<20210530085929.29695-53-venkatkumar.duvvuru@broadcom.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210530085929.29695-53-venkatkumar.duvvuru@broadcom.com", "date": "2021-05-30T08:59:23", "name": "[52/58] net/bnxt: add support for shared sessions in ULP", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "35f0b352813c5951cdd2015e4b920545a6f18156", "submitter": { "id": 1635, "url": "http://patches.dpdk.org/api/people/1635/?format=api", "name": "Venkat Duvvuru", "email": "venkatkumar.duvvuru@broadcom.com" }, "delegate": { "id": 1766, "url": "http://patches.dpdk.org/api/users/1766/?format=api", "username": "ajitkhaparde", "first_name": "Ajit", "last_name": "Khaparde", "email": "ajit.khaparde@broadcom.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20210530085929.29695-53-venkatkumar.duvvuru@broadcom.com/mbox/", "series": [ { "id": 17161, "url": "http://patches.dpdk.org/api/series/17161/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=17161", "date": "2021-05-30T08:58:31", "name": "enhancements to host based flow table management", "version": 1, "mbox": "http://patches.dpdk.org/series/17161/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/93593/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/93593/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 5047BA0524;\n\tSun, 30 May 2021 11:07:20 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 474C541205;\n\tSun, 30 May 2021 11:02:05 +0200 (CEST)", "from relay.smtp-ext.broadcom.com (relay.smtp-ext.broadcom.com\n [192.19.11.229]) by mails.dpdk.org (Postfix) with ESMTP id EE461411F6\n for <dev@dpdk.org>; Sun, 30 May 2021 11:02:01 +0200 (CEST)", "from S60.dhcp.broadcom.net (unknown [10.123.66.170])\n (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))\n (No client certificate requested)\n by relay.smtp-ext.broadcom.com (Postfix) with ESMTPS id 8B4C87DC0;\n Sun, 30 May 2021 02:02:00 -0700 (PDT)" ], "DKIM-Filter": "OpenDKIM Filter v2.11.0 relay.smtp-ext.broadcom.com 8B4C87DC0", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com;\n s=dkimrelay; t=1622365321;\n bh=ofWgOak0CFKJn7JunqgcBy3mVl5e5yoyY6Sx+cyZdjg=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=rbiUDmqDQmag5/2BnRaK50PRkaBBfttw9Ihnzv6ibVx7aSPFdyD7h8Vg94eh4mPAT\n na69BtGy2TjU5j8cm9BSPKPUofavFBqxThhq4fBIwwTS7f+etnQllzOpySBM2fIhh3\n g5N/QqzGjrCcbrE7MXB61vDeI1sem/j9g8++5cFA=", "From": "Venkat Duvvuru <venkatkumar.duvvuru@broadcom.com>", "To": "dev@dpdk.org", "Cc": "Kishore Padmanabha <kishore.padmanabha@broadcom.com>,\n Venkat Duvvuru <venkatkumar.duvvuru@broadcom.com>", "Date": "Sun, 30 May 2021 14:29:23 +0530", "Message-Id": "<20210530085929.29695-53-venkatkumar.duvvuru@broadcom.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20210530085929.29695-1-venkatkumar.duvvuru@broadcom.com>", "References": "<20210530085929.29695-1-venkatkumar.duvvuru@broadcom.com>", "Subject": "[dpdk-dev] [PATCH 52/58] net/bnxt: add support for shared sessions\n in ULP", "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", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Kishore Padmanabha <kishore.padmanabha@broadcom.com>\n\n1. Add template support for shared sessions.\n2. Store the shared session flag in flow data base.\n3. Store WC tcam region in the computational field.\n\nSigned-off-by: Kishore Padmanabha <kishore.padmanabha@broadcom.com>\nSigned-off-by: Venkat Duvvuru <venkatkumar.duvvuru@broadcom.com>\nReviewed-by: Michael Baucom <michael.baucom@broadcom.com>\nReviewed-by: Ajit Kumar Khaparde <ajit.khaparde@broadcom.com>\n---\n drivers/net/bnxt/tf_ulp/bnxt_ulp.c | 10 +-\n drivers/net/bnxt/tf_ulp/bnxt_ulp.h | 5 +-\n drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c | 11 +\n drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c | 2 +-\n drivers/net/bnxt/tf_ulp/ulp_flow_db.c | 19 +-\n drivers/net/bnxt/tf_ulp/ulp_flow_db.h | 18 +-\n drivers/net/bnxt/tf_ulp/ulp_mapper.c | 57 +-\n drivers/net/bnxt/tf_ulp/ulp_mapper.h | 1 -\n .../net/bnxt/tf_ulp/ulp_template_db_enum.h | 21 +-\n drivers/net/bnxt/tf_ulp/ulp_template_db_tbl.c | 444 ++--\n .../bnxt/tf_ulp/ulp_template_db_thor_class.c | 68 +-\n .../bnxt/tf_ulp/ulp_template_db_wh_plus_act.c | 1100 +++++-----\n .../tf_ulp/ulp_template_db_wh_plus_class.c | 1838 +++++++++--------\n drivers/net/bnxt/tf_ulp/ulp_template_struct.h | 3 +\n 14 files changed, 1805 insertions(+), 1792 deletions(-)", "diff": "diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c\nindex 98b86f2c52..0daa8e4c29 100644\n--- a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c\n+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c\n@@ -671,7 +671,7 @@ ulp_eem_tbl_scope_deinit(struct bnxt *bp, struct bnxt_ulp_context *ulp_ctx)\n \tif (!ulp_ctx || !ulp_ctx->cfg_data)\n \t\treturn -EINVAL;\n \n-\ttfp = bnxt_ulp_cntxt_tfp_get(ulp_ctx);\n+\ttfp = bnxt_ulp_cntxt_tfp_get(ulp_ctx, BNXT_ULP_SHARED_SESSION_NO);\n \tif (!tfp) {\n \t\tBNXT_TF_DBG(ERR, \"Failed to get the truflow pointer\\n\");\n \t\treturn -EINVAL;\n@@ -1632,13 +1632,17 @@ bnxt_ulp_cntxt_tfp_set(struct bnxt_ulp_context *ulp, struct tf *tfp)\n \n /* Function to get the tfp session details from the ulp context. */\n struct tf *\n-bnxt_ulp_cntxt_tfp_get(struct bnxt_ulp_context *ulp)\n+bnxt_ulp_cntxt_tfp_get(struct bnxt_ulp_context *ulp,\n+\t\t enum bnxt_ulp_shared_session shared)\n {\n \tif (!ulp) {\n \t\tBNXT_TF_DBG(ERR, \"Invalid arguments\\n\");\n \t\treturn NULL;\n \t}\n-\treturn ulp->g_tfp;\n+\tif (shared)\n+\t\treturn ulp->g_shared_tfp;\n+\telse\n+\t\treturn ulp->g_tfp;\n }\n \n /*\ndiff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp.h b/drivers/net/bnxt/tf_ulp/bnxt_ulp.h\nindex 648fb2ab37..1ba67ed9f6 100644\n--- a/drivers/net/bnxt/tf_ulp/bnxt_ulp.h\n+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp.h\n@@ -31,11 +31,13 @@\n #define BNXT_ULP_VF_REP_ENABLED\t\t0x1\n #define BNXT_ULP_SHARED_SESSION_ENABLED\t0x2\n #define BNXT_ULP_APP_DEV_UNSUPPORTED\t0x4\n+#define BNXT_ULP_HIGH_AVAIL_ENABLED\t0x8\n #define ULP_VF_REP_IS_ENABLED(flag)\t((flag) & BNXT_ULP_VF_REP_ENABLED)\n #define ULP_SHARED_SESSION_IS_ENABLED(flag) ((flag) &\\\n \t\t\t\t\t BNXT_ULP_SHARED_SESSION_ENABLED)\n #define ULP_APP_DEV_UNSUPPORTED_ENABLED(flag)\t((flag) &\\\n \t\t\t\t\t\t BNXT_ULP_APP_DEV_UNSUPPORTED)\n+#define ULP_HIGH_AVAIL_IS_ENABLED(flag)\t((flag) & BNXT_ULP_HIGH_AVAIL_ENABLED)\n \n enum bnxt_ulp_flow_mem_type {\n \tBNXT_ULP_FLOW_MEM_TYPE_INT = 0,\n@@ -158,7 +160,8 @@ bnxt_ulp_cntxt_tfp_set(struct bnxt_ulp_context *ulp, struct tf *tfp);\n \n /* Function to get the tfp session details from ulp context. */\n struct tf *\n-bnxt_ulp_cntxt_tfp_get(struct bnxt_ulp_context *ulp);\n+bnxt_ulp_cntxt_tfp_get(struct bnxt_ulp_context *ulp,\n+\t\t enum bnxt_ulp_shared_session shared);\n \n /* Get the device table entry based on the device id. */\n struct bnxt_ulp_device_params *\ndiff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c b/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c\nindex 42dc9bef71..9c27217573 100644\n--- a/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c\n+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c\n@@ -81,6 +81,8 @@ bnxt_ulp_init_mapper_params(struct bnxt_ulp_mapper_create_parms *mapper_cparms,\n \t\t\t struct ulp_rte_parser_params *params,\n \t\t\t enum bnxt_ulp_fdb_type flow_type)\n {\n+\tuint32_t ulp_flags = 0;\n+\n \tmemset(mapper_cparms, 0, sizeof(*mapper_cparms));\n \tmapper_cparms->flow_type = flow_type;\n \tmapper_cparms->app_priority = params->priority;\n@@ -106,6 +108,15 @@ bnxt_ulp_init_mapper_params(struct bnxt_ulp_mapper_create_parms *mapper_cparms,\n \t\t\t params->hdr_sig_id);\n \tULP_COMP_FLD_IDX_WR(params, BNXT_ULP_CF_IDX_FLOW_SIG_ID,\n \t\t\t params->flow_sig_id);\n+\n+\t/* update the WC Priority flag */\n+\tif (!bnxt_ulp_cntxt_ptr2_ulp_flags_get(params->ulp_ctx, &ulp_flags) &&\n+\t ULP_HIGH_AVAIL_IS_ENABLED(ulp_flags)) {\n+\t\t/* TBD: read the state and Set the WC priority */\n+\t\tULP_COMP_FLD_IDX_WR(params,\n+\t\t\t\t BNXT_ULP_CF_IDX_WC_IS_HA_HIGH_REG, 1);\n+\t}\n+\n }\n \n /* Function to create the rte flow. */\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c b/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c\nindex a25893c63c..7c83cb2054 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c\n@@ -389,7 +389,7 @@ ulp_fc_mgr_alarm_cb(void *arg)\n \t\treturn;\n \t}\n \n-\ttfp = bnxt_ulp_cntxt_tfp_get(ctxt);\n+\ttfp = bnxt_ulp_cntxt_tfp_get(ctxt, BNXT_ULP_SHARED_SESSION_NO);\n \tif (!tfp) {\n \t\tBNXT_TF_DBG(ERR, \"Failed to get the truflow pointer\\n\");\n \t\treturn;\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_flow_db.c b/drivers/net/bnxt/tf_ulp/ulp_flow_db.c\nindex 8a6a925559..e7e8335dbe 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_flow_db.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_flow_db.c\n@@ -156,7 +156,7 @@ ulp_flow_db_res_params_to_info(struct ulp_fdb_resource_info *resource_info,\n \t\tresource_info->resource_hndl = (uint32_t)params->resource_hndl;\n \t\tresource_info->resource_type = params->resource_type;\n \t\tresource_info->resource_sub_type = params->resource_sub_type;\n-\t\tresource_info->reserved = params->reserved;\n+\t\tresource_info->fdb_flags = params->fdb_flags;\n \t} else {\n \t\tresource_info->resource_em_handle = params->resource_hndl;\n \t}\n@@ -187,7 +187,7 @@ ulp_flow_db_res_info_to_params(struct ulp_fdb_resource_info *resource_info,\n \t\tparams->resource_hndl = resource_info->resource_hndl;\n \t\tparams->resource_type = resource_info->resource_type;\n \t\tparams->resource_sub_type = resource_info->resource_sub_type;\n-\t\tparams->reserved = resource_info->reserved;\n+\t\tparams->fdb_flags = resource_info->fdb_flags;\n \t}\n }\n \n@@ -1900,3 +1900,18 @@ ulp_flow_db_parent_flow_count_reset(struct bnxt_ulp_context *ulp_ctxt)\n \t\t}\n \t}\n }\n+\n+/*\n+ * Set the shared bit for the flow db entry\n+ *\n+ * res [in] Ptr to fdb entry\n+ * shared [in] shared flag\n+ *\n+ * returns none\n+ */\n+void ulp_flow_db_shared_session_set(struct ulp_flow_db_res_params *res,\n+\t\t\t\t enum bnxt_ulp_shared_session shared)\n+{\n+\tif (res && (shared & BNXT_ULP_SHARED_SESSION_YES))\n+\t\tres->fdb_flags |= ULP_FDB_FLAG_SHARED_SESSION;\n+}\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_flow_db.h b/drivers/net/bnxt/tf_ulp/ulp_flow_db.h\nindex 62c914833b..d84715e59c 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_flow_db.h\n+++ b/drivers/net/bnxt/tf_ulp/ulp_flow_db.h\n@@ -13,6 +13,9 @@\n #define BNXT_FLOW_DB_DEFAULT_NUM_FLOWS\t\t512\n #define BNXT_FLOW_DB_DEFAULT_NUM_RESOURCES\t8\n \n+/* Defines for the fdb flag */\n+#define ULP_FDB_FLAG_SHARED_SESSION\t0x1\n+\n /*\n * Structure for the flow database resource information\n * The below structure is based on the below paritions\n@@ -30,7 +33,7 @@ struct ulp_fdb_resource_info {\n \t\t\tuint8_t\t\tresource_func_lower;\n \t\t\tuint8_t\t\tresource_type;\n \t\t\tuint8_t\t\tresource_sub_type;\n-\t\t\tuint8_t\t\treserved;\n+\t\t\tuint8_t\t\tfdb_flags;\n \t\t\tuint32_t\tresource_hndl;\n \t\t};\n \t};\n@@ -86,7 +89,7 @@ struct ulp_flow_db_res_params {\n \tenum bnxt_ulp_resource_func\tresource_func;\n \tuint8_t\t\t\t\tresource_type;\n \tuint8_t\t\t\t\tresource_sub_type;\n-\tuint8_t\t\t\t\treserved;\n+\tuint8_t\t\t\t\tfdb_flags;\n \tuint8_t\t\t\t\tcritical_resource;\n \tuint64_t\t\t\tresource_hndl;\n };\n@@ -403,4 +406,15 @@ ulp_flow_db_parent_flow_count_get(struct bnxt_ulp_context *ulp_ctxt,\n void\n ulp_flow_db_parent_flow_count_reset(struct bnxt_ulp_context *ulp_ctxt);\n \n+/*\n+ * Set the shared bit for the flow db entry\n+ *\n+ * res [in] Ptr to fdb entry\n+ * shared [in] shared flag\n+ *\n+ * returns none\n+ */\n+void ulp_flow_db_shared_session_set(struct ulp_flow_db_res_params *res,\n+\t\t\t\t enum bnxt_ulp_shared_session shared);\n+\n #endif /* _ULP_FLOW_DB_H_ */\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_mapper.c b/drivers/net/bnxt/tf_ulp/ulp_mapper.c\nindex b5cefbeb08..e2404c392b 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_mapper.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_mapper.c\n@@ -121,7 +121,7 @@ ulp_mapper_resource_ident_allocate(struct bnxt_ulp_context *ulp_ctx,\n \tstruct tf *tfp;\n \tint32_t rc = 0;\n \n-\ttfp = bnxt_ulp_cntxt_tfp_get(ulp_ctx);\n+\ttfp = bnxt_ulp_cntxt_tfp_get(ulp_ctx, BNXT_ULP_SHARED_SESSION_NO);\n \tif (!tfp)\n \t\treturn -EINVAL;\n \n@@ -174,7 +174,7 @@ ulp_mapper_resource_index_tbl_alloc(struct bnxt_ulp_context *ulp_ctx,\n \tuint32_t tbl_scope_id;\n \tint32_t rc = 0;\n \n-\ttfp = bnxt_ulp_cntxt_tfp_get(ulp_ctx);\n+\ttfp = bnxt_ulp_cntxt_tfp_get(ulp_ctx, BNXT_ULP_SHARED_SESSION_NO);\n \tif (!tfp)\n \t\treturn -EINVAL;\n \n@@ -741,7 +741,7 @@ ulp_mapper_ident_process(struct bnxt_ulp_mapper_parms *parms,\n \tstruct tf *tfp;\n \tint rc;\n \n-\ttfp = bnxt_ulp_cntxt_tfp_get(parms->ulp_ctx);\n+\ttfp = bnxt_ulp_cntxt_tfp_get(parms->ulp_ctx, tbl->shared_session);\n \tif (!tfp) {\n \t\tBNXT_TF_DBG(ERR, \"Failed to get tf pointer\\n\");\n \t\treturn -EINVAL;\n@@ -776,6 +776,7 @@ ulp_mapper_ident_process(struct bnxt_ulp_mapper_parms *parms,\n \t\tfid_parms.resource_type\t= ident->ident_type;\n \t\tfid_parms.resource_hndl\t= iparms.id;\n \t\tfid_parms.critical_resource = tbl->critical_resource;\n+\t\tulp_flow_db_shared_session_set(&fid_parms, tbl->shared_session);\n \n \t\trc = ulp_mapper_fdb_opc_process(parms, tbl, &fid_parms);\n \t\tif (rc) {\n@@ -822,7 +823,7 @@ ulp_mapper_ident_extract(struct bnxt_ulp_mapper_parms *parms,\n \tint rc;\n \n \t/* Get the tfp from ulp context */\n-\ttfp = bnxt_ulp_cntxt_tfp_get(parms->ulp_ctx);\n+\ttfp = bnxt_ulp_cntxt_tfp_get(parms->ulp_ctx, tbl->shared_session);\n \tif (!tfp) {\n \t\tBNXT_TF_DBG(ERR, \"Failed to get tf pointer\\n\");\n \t\treturn -EINVAL;\n@@ -868,6 +869,8 @@ ulp_mapper_ident_extract(struct bnxt_ulp_mapper_parms *parms,\n \tfid_parms.resource_type = ident->ident_type;\n \tfid_parms.resource_hndl = sparms.search_id;\n \tfid_parms.critical_resource = tbl->critical_resource;\n+\tulp_flow_db_shared_session_set(&fid_parms, tbl->shared_session);\n+\n \trc = ulp_mapper_fdb_opc_process(parms, tbl, &fid_parms);\n \tif (rc) {\n \t\tBNXT_TF_DBG(ERR, \"Failed to link res to flow rc = %d\\n\",\n@@ -1513,6 +1516,8 @@ ulp_mapper_mark_gfid_process(struct bnxt_ulp_mapper_parms *parms,\n \tfid_parms.critical_resource = tbl->critical_resource;\n \tfid_parms.resource_type\t= mark_flag;\n \tfid_parms.resource_hndl\t= gfid;\n+\tulp_flow_db_shared_session_set(&fid_parms, tbl->shared_session);\n+\n \trc = ulp_mapper_fdb_opc_process(parms, tbl, &fid_parms);\n \tif (rc)\n \t\tBNXT_TF_DBG(ERR, \"Fail to link res to flow rc = %d\\n\", rc);\n@@ -1559,6 +1564,8 @@ ulp_mapper_mark_act_ptr_process(struct bnxt_ulp_mapper_parms *parms,\n \tfid_parms.critical_resource = tbl->critical_resource;\n \tfid_parms.resource_type\t= mark_flag;\n \tfid_parms.resource_hndl\t= act_idx;\n+\tulp_flow_db_shared_session_set(&fid_parms, tbl->shared_session);\n+\n \trc = ulp_mapper_fdb_opc_process(parms, tbl, &fid_parms);\n \tif (rc)\n \t\tBNXT_TF_DBG(ERR, \"Fail to link res to flow rc = %d\\n\", rc);\n@@ -1605,6 +1612,8 @@ ulp_mapper_mark_vfr_idx_process(struct bnxt_ulp_mapper_parms *parms,\n \tfid_parms.critical_resource = tbl->critical_resource;\n \tfid_parms.resource_type\t= mark_flag;\n \tfid_parms.resource_hndl\t= act_idx;\n+\tulp_flow_db_shared_session_set(&fid_parms, tbl->shared_session);\n+\n \trc = ulp_mapper_fdb_opc_process(parms, tbl, &fid_parms);\n \tif (rc)\n \t\tBNXT_TF_DBG(ERR, \"Fail to link res to flow rc = %d\\n\", rc);\n@@ -1671,7 +1680,7 @@ ulp_mapper_tcam_tbl_entry_write(struct bnxt_ulp_mapper_parms *parms,\n \tuint16_t tmplen;\n \tint32_t rc;\n \n-\ttfp = bnxt_ulp_cntxt_tfp_get(parms->ulp_ctx);\n+\ttfp = bnxt_ulp_cntxt_tfp_get(parms->ulp_ctx, tbl->shared_session);\n \tif (!tfp) {\n \t\tBNXT_TF_DBG(ERR, \"Failed to get truflow pointer\\n\");\n \t\treturn -EINVAL;\n@@ -1838,7 +1847,7 @@ ulp_mapper_tcam_tbl_process(struct bnxt_ulp_mapper_parms *parms,\n \t\treturn 0;\n \t}\n \n-\ttfp = bnxt_ulp_cntxt_tfp_get(parms->ulp_ctx);\n+\ttfp = bnxt_ulp_cntxt_tfp_get(parms->ulp_ctx, tbl->shared_session);\n \tif (!tfp) {\n \t\tBNXT_TF_DBG(ERR, \"Failed to get truflow pointer\\n\");\n \t\treturn -EINVAL;\n@@ -1887,7 +1896,9 @@ ulp_mapper_tcam_tbl_process(struct bnxt_ulp_mapper_parms *parms,\n \t}\n \n \t/* For wild card tcam perform the post process to swap the blob */\n-\tif (tbl->resource_type == TF_TCAM_TBL_TYPE_WC_TCAM) {\n+\tif (tbl->resource_type == TF_TCAM_TBL_TYPE_WC_TCAM ||\n+\t tbl->resource_type == TF_TCAM_TBL_TYPE_WC_TCAM_HIGH ||\n+\t tbl->resource_type == TF_TCAM_TBL_TYPE_WC_TCAM_LOW) {\n \t\tif (dparms->dynamic_pad_en) {\n \t\t\t/* Sets up the slices for writing to the WC TCAM */\n \t\t\trc = ulp_mapper_wc_tcam_tbl_dyn_post_process(dparms,\n@@ -2004,6 +2015,8 @@ ulp_mapper_tcam_tbl_process(struct bnxt_ulp_mapper_parms *parms,\n \tfid_parms.resource_type\t= tbl->resource_type;\n \tfid_parms.critical_resource = tbl->critical_resource;\n \tfid_parms.resource_hndl\t= idx;\n+\tulp_flow_db_shared_session_set(&fid_parms, tbl->shared_session);\n+\n \trc = ulp_mapper_fdb_opc_process(parms, tbl, &fid_parms);\n \tif (rc) {\n \t\tBNXT_TF_DBG(ERR, \"Failed to link resource to flow rc = %d\\n\",\n@@ -2032,7 +2045,7 @@ ulp_mapper_em_tbl_process(struct bnxt_ulp_mapper_parms *parms,\n \tstruct ulp_blob key, data;\n \tuint32_t i, num_kflds;\n \tuint16_t tmplen;\n-\tstruct tf *tfp = bnxt_ulp_cntxt_tfp_get(parms->ulp_ctx);\n+\tstruct tf *tfp;\n \tstruct ulp_flow_db_res_params\tfid_parms = { 0 };\n \tstruct tf_insert_em_entry_parms iparms = { 0 };\n \tstruct tf_delete_em_entry_parms free_parms = { 0 };\n@@ -2042,6 +2055,7 @@ ulp_mapper_em_tbl_process(struct bnxt_ulp_mapper_parms *parms,\n \tint32_t rc = 0;\n \tint32_t pad = 0;\n \n+\ttfp = bnxt_ulp_cntxt_tfp_get(parms->ulp_ctx, tbl->shared_session);\n \trc = bnxt_ulp_cntxt_mem_type_get(parms->ulp_ctx, &mtype);\n \tif (rc) {\n \t\tBNXT_TF_DBG(ERR, \"Failed to get the mem type for EM\\n\");\n@@ -2208,7 +2222,7 @@ ulp_mapper_index_tbl_process(struct bnxt_ulp_mapper_parms *parms,\n \tstruct tf_get_tbl_entry_parms gparms = { 0 };\n \tstruct tf_free_tbl_entry_parms free_parms = { 0 };\n \tuint32_t tbl_scope_id;\n-\tstruct tf *tfp = bnxt_ulp_cntxt_tfp_get(parms->ulp_ctx);\n+\tstruct tf *tfp;\n \tstruct bnxt_ulp_glb_resource_info glb_res;\n \tuint16_t bit_size;\n \tbool alloc = false;\n@@ -2217,6 +2231,7 @@ ulp_mapper_index_tbl_process(struct bnxt_ulp_mapper_parms *parms,\n \tuint64_t act_rec_size;\n \tbool shared = false;\n \n+\ttfp = bnxt_ulp_cntxt_tfp_get(parms->ulp_ctx, tbl->shared_session);\n \t/* use the max size if encap is enabled */\n \tif (tbl->encap_num_fields)\n \t\tbit_size = BNXT_ULP_FLMP_BLOB_SIZE_IN_BITS;\n@@ -2460,6 +2475,7 @@ ulp_mapper_index_tbl_process(struct bnxt_ulp_mapper_parms *parms,\n \tfid_parms.resource_sub_type = tbl->resource_sub_type;\n \tfid_parms.resource_hndl\t= index;\n \tfid_parms.critical_resource = tbl->critical_resource;\n+\tulp_flow_db_shared_session_set(&fid_parms, tbl->shared_session);\n \n \trc = ulp_mapper_fdb_opc_process(parms, tbl, &fid_parms);\n \tif (rc) {\n@@ -2505,10 +2521,11 @@ ulp_mapper_if_tbl_process(struct bnxt_ulp_mapper_parms *parms,\n \tint32_t rc = 0;\n \tstruct tf_set_if_tbl_entry_parms iftbl_params = { 0 };\n \tstruct tf_get_if_tbl_entry_parms get_parms = { 0 };\n-\tstruct tf *tfp = bnxt_ulp_cntxt_tfp_get(parms->ulp_ctx);\n+\tstruct tf *tfp;\n \tenum bnxt_ulp_if_tbl_opc if_opc = tbl->tbl_opcode;\n \tuint32_t res_size;\n \n+\ttfp = bnxt_ulp_cntxt_tfp_get(parms->ulp_ctx, tbl->shared_session);\n \t/* Initialize the blob data */\n \tif (!ulp_blob_init(&data, tbl->result_bit_size,\n \t\t\t parms->device_params->byte_order)) {\n@@ -2610,7 +2627,7 @@ ulp_mapper_gen_tbl_process(struct bnxt_ulp_mapper_parms *parms,\n \tstruct ulp_flow_db_res_params fid_parms;\n \tstruct ulp_mapper_gen_tbl_entry gen_tbl_ent, *g;\n \tstruct ulp_gen_hash_entry_params hash_entry;\n-\tuint16_t tmplen;\n+\tuint16_t tmplen = 0;\n \tstruct ulp_blob key, data;\n \tuint8_t *cache_key;\n \tint32_t tbl_idx;\n@@ -2687,6 +2704,11 @@ ulp_mapper_gen_tbl_process(struct bnxt_ulp_mapper_parms *parms,\n \t\t}\n \t} else {\n \t\t/* convert key to index directly */\n+\t\tif (ULP_BITS_2_BYTE(tmplen) > (int32_t)sizeof(key_index)) {\n+\t\t\tBNXT_TF_DBG(ERR, \"%s: keysize is bigger then 4 bytes\\n\",\n+\t\t\t\t gen_tbl_list->gen_tbl_name);\n+\t\t\treturn -EINVAL;\n+\t\t}\n \t\tmemcpy(&key_index, cache_key, ULP_BITS_2_BYTE(tmplen));\n \t\t/* Get the generic table entry */\n \t\tif (ulp_mapper_gen_tbl_entry_get(gen_tbl_list, key_index,\n@@ -2791,6 +2813,8 @@ ulp_mapper_gen_tbl_process(struct bnxt_ulp_mapper_parms *parms,\n \t\tfid_parms.resource_sub_type = tbl->resource_sub_type;\n \t\tfid_parms.resource_hndl\t= key_index;\n \t\tfid_parms.critical_resource = tbl->critical_resource;\n+\t\tulp_flow_db_shared_session_set(&fid_parms, tbl->shared_session);\n+\n \t\trc = ulp_mapper_fdb_opc_process(parms, tbl, &fid_parms);\n \t\tif (rc)\n \t\t\tBNXT_TF_DBG(ERR, \"Fail to add gen ent flowdb %d\\n\", rc);\n@@ -3514,8 +3538,10 @@ ulp_mapper_resource_free(struct bnxt_ulp_context *ulp,\n \t\tBNXT_TF_DBG(ERR, \"Unable to free resource\\n \");\n \t\treturn -EINVAL;\n \t}\n-\n-\ttfp = bnxt_ulp_cntxt_tfp_get(ulp);\n+\tif (res->fdb_flags & ULP_FDB_FLAG_SHARED_SESSION)\n+\t\ttfp = bnxt_ulp_cntxt_tfp_get(ulp, BNXT_ULP_SHARED_SESSION_YES);\n+\telse\n+\t\ttfp = bnxt_ulp_cntxt_tfp_get(ulp, BNXT_ULP_SHARED_SESSION_NO);\n \tif (!tfp) {\n \t\tBNXT_TF_DBG(ERR, \"Unable to free resource failed to get tfp\\n\");\n \t\treturn -EINVAL;\n@@ -3680,7 +3706,6 @@ ulp_mapper_flow_create(struct bnxt_ulp_context *ulp_ctx,\n \tparms.hdr_field = cparms->hdr_field;\n \tparms.fld_bitmap = cparms->fld_bitmap;\n \tparms.comp_fld = cparms->comp_fld;\n-\tparms.tfp = bnxt_ulp_cntxt_tfp_get(ulp_ctx);\n \tparms.ulp_ctx = ulp_ctx;\n \tparms.act_tid = cparms->act_tid;\n \tparms.class_tid = cparms->class_tid;\n@@ -3779,7 +3804,7 @@ ulp_mapper_init(struct bnxt_ulp_context *ulp_ctx)\n \tif (!ulp_ctx)\n \t\treturn -EINVAL;\n \n-\ttfp = bnxt_ulp_cntxt_tfp_get(ulp_ctx);\n+\ttfp = bnxt_ulp_cntxt_tfp_get(ulp_ctx, BNXT_ULP_SHARED_SESSION_NO);\n \tif (!tfp)\n \t\treturn -EINVAL;\n \n@@ -3850,7 +3875,7 @@ ulp_mapper_deinit(struct bnxt_ulp_context *ulp_ctx)\n \t\treturn;\n \t}\n \n-\ttfp = bnxt_ulp_cntxt_tfp_get(ulp_ctx);\n+\ttfp = bnxt_ulp_cntxt_tfp_get(ulp_ctx, BNXT_ULP_SHARED_SESSION_NO);\n \tif (!tfp) {\n \t\tBNXT_TF_DBG(ERR, \"Failed to acquire tfp.\\n\");\n \t\t/* Free the mapper data regardless of errors. */\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_mapper.h b/drivers/net/bnxt/tf_ulp/ulp_mapper.h\nindex edd5978ac6..4c5dd4b836 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_mapper.h\n+++ b/drivers/net/bnxt/tf_ulp/ulp_mapper.h\n@@ -48,7 +48,6 @@ struct bnxt_ulp_mapper_parms {\n \tstruct ulp_rte_field_bitmap\t\t*fld_bitmap;\n \tuint32_t\t\t\t\t*comp_fld;\n \tstruct ulp_regfile\t\t\t*regfile;\n-\tstruct tf\t\t\t\t*tfp;\n \tstruct bnxt_ulp_context\t\t\t*ulp_ctx;\n \tuint32_t\t\t\t\tfid;\n \tenum bnxt_ulp_fdb_type\t\t\tflow_type;\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_enum.h b/drivers/net/bnxt/tf_ulp/ulp_template_db_enum.h\nindex bc701aa8a5..8cbbe203a8 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_template_db_enum.h\n+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_enum.h\n@@ -3,7 +3,7 @@\n * All rights reserved.\n */\n \n-/* date: Wed Mar 17 11:31:19 2021 */\n+/* date: Sun Mar 21 13:04:51 2021 */\n \n #ifndef ULP_TEMPLATE_DB_H_\n #define ULP_TEMPLATE_DB_H_\n@@ -26,10 +26,10 @@\n #define BNXT_ULP_ACT_HID_SHFTR 27\n #define BNXT_ULP_ACT_HID_SHFTL 26\n #define BNXT_ULP_ACT_HID_MASK 2047\n-#define BNXT_ULP_GLB_RESOURCE_TBL_MAX_SZ 33\n-#define BNXT_ULP_APP_GLB_RESOURCE_TBL_MAX_SZ 27\n-#define BNXT_ULP_RESOURCE_RESV_LIST_MAX_SZ 219\n #define BNXT_ULP_APP_RESOURCE_RESV_LIST_MAX_SZ 4\n+#define BNXT_ULP_GLB_RESOURCE_TBL_MAX_SZ 33\n+#define BNXT_ULP_APP_GLB_RESOURCE_TBL_MAX_SZ 26\n+#define BNXT_ULP_RESOURCE_RESV_LIST_MAX_SZ 205\n #define BNXT_ULP_APP_CAP_TBL_MAX_SZ 6\n #define BNXT_ULP_COND_GOTO_REJECT 1023\n #define BNXT_ULP_COND_GOTO_RF 0x10000\n@@ -218,7 +218,8 @@ enum bnxt_ulp_cf_idx {\n \tBNXT_ULP_CF_IDX_HDR_SIG_ID = 59,\n \tBNXT_ULP_CF_IDX_FLOW_SIG_ID = 60,\n \tBNXT_ULP_CF_IDX_WC_MATCH = 61,\n-\tBNXT_ULP_CF_IDX_LAST = 62\n+\tBNXT_ULP_CF_IDX_WC_IS_HA_HIGH_REG = 62,\n+\tBNXT_ULP_CF_IDX_LAST = 63\n };\n \n enum bnxt_ulp_cond_list_opc {\n@@ -468,6 +469,12 @@ enum bnxt_ulp_rf_idx {\n \tBNXT_ULP_RF_IDX_LAST = 40\n };\n \n+enum bnxt_ulp_shared_session {\n+\tBNXT_ULP_SHARED_SESSION_NO = 0,\n+\tBNXT_ULP_SHARED_SESSION_YES = 1,\n+\tBNXT_ULP_SHARED_SESSION_LAST = 2\n+};\n+\n enum bnxt_ulp_tcam_tbl_opc {\n \tBNXT_ULP_TCAM_TBL_OPC_NOT_USED = 0,\n \tBNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE = 1,\n@@ -571,6 +578,7 @@ enum bnxt_ulp_act_prop_sz {\n \tBNXT_ULP_ACT_PROP_SZ_ENCAP_TUN = 32,\n \tBNXT_ULP_ACT_PROP_SZ_JUMP = 4,\n \tBNXT_ULP_ACT_PROP_SZ_SHARED_HANDLE = 8,\n+\tBNXT_ULP_ACT_PROP_SZ_RSS = 64,\n \tBNXT_ULP_ACT_PROP_SZ_LAST = 4\n };\n \n@@ -617,7 +625,8 @@ enum bnxt_ulp_act_prop_idx {\n \tBNXT_ULP_ACT_PROP_IDX_ENCAP_TUN = 225,\n \tBNXT_ULP_ACT_PROP_IDX_JUMP = 257,\n \tBNXT_ULP_ACT_PROP_IDX_SHARED_HANDLE = 261,\n-\tBNXT_ULP_ACT_PROP_IDX_LAST = 269\n+\tBNXT_ULP_ACT_PROP_IDX_RSS = 269,\n+\tBNXT_ULP_ACT_PROP_IDX_LAST = 333\n };\n \n enum ulp_wp_sym {\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 ffa42ffa8b..be7914a5cd 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@@ -3,7 +3,7 @@\n * All rights reserved.\n */\n \n-/* date: Wed Mar 17 11:31:19 2021 */\n+/* date: Sun Mar 21 13:04:51 2021 */\n \n #include \"ulp_template_db_enum.h\"\n #include \"ulp_template_db_field.h\"\n@@ -278,7 +278,7 @@ struct bnxt_ulp_resource_resv_info ulp_app_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_WC_TCAM,\n-\t.count = 256\n+\t.count = 512\n \t},\n \t{\n \t.app_id = 1,\n@@ -286,7 +286,7 @@ struct bnxt_ulp_resource_resv_info ulp_app_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_WC_TCAM,\n-\t.count = 256\n+\t.count = 512\n \t},\n \t{\n \t.app_id = 2,\n@@ -294,7 +294,7 @@ struct bnxt_ulp_resource_resv_info ulp_app_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_WC_TCAM,\n-\t.count = 256\n+\t.count = 512\n \t},\n \t{\n \t.app_id = 2,\n@@ -302,12 +302,12 @@ struct bnxt_ulp_resource_resv_info ulp_app_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_WC_TCAM,\n-\t.count = 256\n+\t.count = 512\n \t}\n };\n \n-/* List of device specific parameters */\n-struct bnxt_ulp_glb_resource_info ulp_app_glb_resource_tbl[] = {\n+/* List of global app tf resources required to be reserved per app/device */\n+struct bnxt_ulp_glb_resource_info ulp_app_glb_resource_tbl[] = {\n \t{\n \t.app_id = 1,\n \t.device_id = BNXT_ULP_DEVICE_ID_WH_PLUS,\n@@ -368,6 +368,14 @@ struct bnxt_ulp_glb_resource_info ulp_app_glb_resource_tbl[] = {\n \t.app_id = 1,\n \t.device_id = BNXT_ULP_DEVICE_ID_THOR,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n+\t.resource_type = TF_IDENT_TYPE_L2_CTXT_HIGH,\n+\t.glb_regfile_index = BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1,\n+\t.direction = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id = 1,\n+\t.device_id = BNXT_ULP_DEVICE_ID_THOR,\n+\t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n \t.resource_type = TF_IDENT_TYPE_EM_PROF,\n \t.glb_regfile_index = BNXT_ULP_GLB_RF_IDX_APP_GLB_EM_PROFILE_ID_0,\n \t.direction = TF_DIR_RX\n@@ -401,31 +409,23 @@ struct bnxt_ulp_glb_resource_info ulp_app_glb_resource_tbl[] = {\n \t.device_id = BNXT_ULP_DEVICE_ID_THOR,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_WC_FKB,\n-\t.glb_regfile_index = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_0,\n-\t.direction = TF_DIR_TX\n-\t},\n-\t{\n-\t.app_id = 1,\n-\t.device_id = BNXT_ULP_DEVICE_ID_THOR,\n-\t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n-\t.resource_type = TF_IDENT_TYPE_EM_PROF,\n-\t.glb_regfile_index = BNXT_ULP_GLB_RF_IDX_APP_GLB_EM_PROFILE_ID_0,\n-\t.direction = TF_DIR_TX\n+\t.glb_regfile_index = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_1,\n+\t.direction = TF_DIR_RX\n \t},\n \t{\n-\t.app_id = 1,\n+\t.app_id = 2,\n \t.device_id = BNXT_ULP_DEVICE_ID_WH_PLUS,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n-\t.resource_type = TF_IDENT_TYPE_WC_PROF,\n-\t.glb_regfile_index = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0,\n-\t.direction = TF_DIR_TX\n+\t.resource_type = TF_IDENT_TYPE_PROF_FUNC,\n+\t.glb_regfile_index = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0,\n+\t.direction = TF_DIR_RX\n \t},\n \t{\n \t.app_id = 2,\n \t.device_id = BNXT_ULP_DEVICE_ID_WH_PLUS,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n-\t.resource_type = TF_IDENT_TYPE_PROF_FUNC,\n-\t.glb_regfile_index = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0,\n+\t.resource_type = TF_IDENT_TYPE_L2_CTXT_HIGH,\n+\t.glb_regfile_index = BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0,\n \t.direction = TF_DIR_RX\n \t},\n \t{\n@@ -433,7 +433,7 @@ struct bnxt_ulp_glb_resource_info ulp_app_glb_resource_tbl[] = {\n \t.device_id = BNXT_ULP_DEVICE_ID_WH_PLUS,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n \t.resource_type = TF_IDENT_TYPE_L2_CTXT_HIGH,\n-\t.glb_regfile_index = BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0,\n+\t.glb_regfile_index = BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1,\n \t.direction = TF_DIR_RX\n \t},\n \t{\n@@ -472,6 +472,14 @@ struct bnxt_ulp_glb_resource_info ulp_app_glb_resource_tbl[] = {\n \t.app_id = 2,\n \t.device_id = BNXT_ULP_DEVICE_ID_THOR,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n+\t.resource_type = TF_IDENT_TYPE_L2_CTXT_HIGH,\n+\t.glb_regfile_index = BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1,\n+\t.direction = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id = 2,\n+\t.device_id = BNXT_ULP_DEVICE_ID_THOR,\n+\t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n \t.resource_type = TF_IDENT_TYPE_EM_PROF,\n \t.glb_regfile_index = BNXT_ULP_GLB_RF_IDX_APP_GLB_EM_PROFILE_ID_0,\n \t.direction = TF_DIR_RX\n@@ -505,28 +513,12 @@ struct bnxt_ulp_glb_resource_info ulp_app_glb_resource_tbl[] = {\n \t.device_id = BNXT_ULP_DEVICE_ID_THOR,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_WC_FKB,\n-\t.glb_regfile_index = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_0,\n-\t.direction = TF_DIR_TX\n-\t},\n-\t{\n-\t.app_id = 2,\n-\t.device_id = BNXT_ULP_DEVICE_ID_THOR,\n-\t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n-\t.resource_type = TF_IDENT_TYPE_EM_PROF,\n-\t.glb_regfile_index = BNXT_ULP_GLB_RF_IDX_APP_GLB_EM_PROFILE_ID_0,\n-\t.direction = TF_DIR_TX\n-\t},\n-\t{\n-\t.app_id = 2,\n-\t.device_id = BNXT_ULP_DEVICE_ID_WH_PLUS,\n-\t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n-\t.resource_type = TF_IDENT_TYPE_WC_PROF,\n-\t.glb_regfile_index = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0,\n-\t.direction = TF_DIR_TX\n+\t.glb_regfile_index = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_1,\n+\t.direction = TF_DIR_RX\n \t}\n };\n \n-/* List of device specific parameters */\n+/* List of global tf resources required to be reserved per app/device */\n struct bnxt_ulp_glb_resource_info ulp_glb_resource_tbl[] = {\n \t{\n \t.app_id = 0,\n@@ -818,7 +810,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n \t.resource_type = TF_IDENT_TYPE_WC_PROF,\n-\t.count = 192\n+\t.count = 191\n \t},\n \t{\n \t.app_id = 0,\n@@ -962,7 +954,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n \t.resource_type = TF_IDENT_TYPE_WC_PROF,\n-\t.count = 192\n+\t.count = 191\n \t},\n \t{\n \t.app_id = 0,\n@@ -1386,7 +1378,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n \t.resource_type = TF_IDENT_TYPE_L2_CTXT_HIGH,\n-\t.count = 422\n+\t.count = 32\n \t},\n \t{\n \t.app_id = 1,\n@@ -1394,7 +1386,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n \t.resource_type = TF_IDENT_TYPE_L2_CTXT_LOW,\n-\t.count = 6\n+\t.count = 2\n \t},\n \t{\n \t.app_id = 1,\n@@ -1402,7 +1394,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n \t.resource_type = TF_IDENT_TYPE_WC_PROF,\n-\t.count = 192\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 1,\n@@ -1410,7 +1402,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n \t.resource_type = TF_IDENT_TYPE_PROF_FUNC,\n-\t.count = 64\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 1,\n@@ -1418,7 +1410,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n \t.resource_type = TF_IDENT_TYPE_EM_PROF,\n-\t.count = 192\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 1,\n@@ -1426,7 +1418,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,\n-\t.count = 8192\n+\t.count = 512\n \t},\n \t{\n \t.app_id = 1,\n@@ -1434,7 +1426,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_ACT_STATS_64,\n-\t.count = 8192\n+\t.count = 1024\n \t},\n \t{\n \t.app_id = 1,\n@@ -1442,7 +1434,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_ACT_MODIFY_IPV4,\n-\t.count = 1023\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 1,\n@@ -1450,7 +1442,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_ACT_ENCAP_8B,\n-\t.count = 511\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 1,\n@@ -1458,7 +1450,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_ACT_ENCAP_16B,\n-\t.count = 63\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 1,\n@@ -1466,15 +1458,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_ACT_SP_SMAC,\n-\t.count = 255\n-\t},\n-\t{\n-\t.app_id = 1,\n-\t.device_id = BNXT_ULP_DEVICE_ID_WH_PLUS,\n-\t.direction = TF_DIR_RX,\n-\t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n-\t.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,\n-\t.count = 1\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 1,\n@@ -1482,7 +1466,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\n-\t.count = 422\n+\t.count = 32\n \t},\n \t{\n \t.app_id = 1,\n@@ -1490,7 +1474,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,\n-\t.count = 6\n+\t.count = 2\n \t},\n \t{\n \t.app_id = 1,\n@@ -1498,7 +1482,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM,\n-\t.count = 960\n+\t.count = 32\n \t},\n \t{\n \t.app_id = 1,\n@@ -1506,7 +1490,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_WC_TCAM,\n-\t.count = 88\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 1,\n@@ -1514,15 +1498,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,\n \t.resource_type = TF_EM_TBL_TYPE_EM_RECORD,\n-\t.count = 13168\n-\t},\n-\t{\n-\t.app_id = 1,\n-\t.device_id = BNXT_ULP_DEVICE_ID_WH_PLUS,\n-\t.direction = TF_DIR_RX,\n-\t.resource_func = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,\n-\t.resource_type = TF_EM_TBL_TYPE_TBL_SCOPE,\n-\t.count = 1\n+\t.count = 1024\n \t},\n \t{\n \t.app_id = 1,\n@@ -1530,7 +1506,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n \t.resource_type = TF_IDENT_TYPE_L2_CTXT_HIGH,\n-\t.count = 292\n+\t.count = 32\n \t},\n \t{\n \t.app_id = 1,\n@@ -1538,7 +1514,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n \t.resource_type = TF_IDENT_TYPE_L2_CTXT_LOW,\n-\t.count = 148\n+\t.count = 2\n \t},\n \t{\n \t.app_id = 1,\n@@ -1546,7 +1522,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n \t.resource_type = TF_IDENT_TYPE_WC_PROF,\n-\t.count = 192\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 1,\n@@ -1554,7 +1530,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n \t.resource_type = TF_IDENT_TYPE_PROF_FUNC,\n-\t.count = 64\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 1,\n@@ -1562,7 +1538,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n \t.resource_type = TF_IDENT_TYPE_EM_PROF,\n-\t.count = 192\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 1,\n@@ -1570,7 +1546,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,\n-\t.count = 8192\n+\t.count = 512\n \t},\n \t{\n \t.app_id = 1,\n@@ -1578,7 +1554,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_ACT_STATS_64,\n-\t.count = 8192\n+\t.count = 1024\n \t},\n \t{\n \t.app_id = 1,\n@@ -1586,7 +1562,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_ACT_MODIFY_IPV4,\n-\t.count = 1023\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 1,\n@@ -1594,7 +1570,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_ACT_ENCAP_64B,\n-\t.count = 511\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 1,\n@@ -1602,7 +1578,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_ACT_ENCAP_16B,\n-\t.count = 223\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 1,\n@@ -1610,7 +1586,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_ACT_ENCAP_8B,\n-\t.count = 255\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 1,\n@@ -1618,7 +1594,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,\n-\t.count = 488\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 1,\n@@ -1626,15 +1602,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_ACT_SP_SMAC_IPV6,\n-\t.count = 511\n-\t},\n-\t{\n-\t.app_id = 1,\n-\t.device_id = BNXT_ULP_DEVICE_ID_WH_PLUS,\n-\t.direction = TF_DIR_TX,\n-\t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n-\t.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,\n-\t.count = 1\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 1,\n@@ -1642,7 +1610,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\n-\t.count = 292\n+\t.count = 32\n \t},\n \t{\n \t.app_id = 1,\n@@ -1650,7 +1618,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,\n-\t.count = 144\n+\t.count = 2\n \t},\n \t{\n \t.app_id = 1,\n@@ -1658,7 +1626,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM,\n-\t.count = 960\n+\t.count = 32\n \t},\n \t{\n \t.app_id = 1,\n@@ -1666,7 +1634,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_WC_TCAM,\n-\t.count = 928\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 1,\n@@ -1674,15 +1642,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,\n \t.resource_type = TF_EM_TBL_TYPE_EM_RECORD,\n-\t.count = 15232\n-\t},\n-\t{\n-\t.app_id = 1,\n-\t.device_id = BNXT_ULP_DEVICE_ID_WH_PLUS,\n-\t.direction = TF_DIR_TX,\n-\t.resource_func = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,\n-\t.resource_type = TF_EM_TBL_TYPE_TBL_SCOPE,\n-\t.count = 1\n+\t.count = 1024\n \t},\n \t{\n \t.app_id = 1,\n@@ -1690,7 +1650,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n \t.resource_type = TF_IDENT_TYPE_L2_CTXT_HIGH,\n-\t.count = 26\n+\t.count = 32\n \t},\n \t{\n \t.app_id = 1,\n@@ -1698,7 +1658,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n \t.resource_type = TF_IDENT_TYPE_L2_CTXT_LOW,\n-\t.count = 6\n+\t.count = 2\n \t},\n \t{\n \t.app_id = 1,\n@@ -1730,14 +1690,6 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,\n-\t.count = 1024\n-\t},\n-\t{\n-\t.app_id = 1,\n-\t.device_id = BNXT_ULP_DEVICE_ID_THOR,\n-\t.direction = TF_DIR_RX,\n-\t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n-\t.resource_type = TF_TBL_TYPE_ACT_STATS_64,\n \t.count = 512\n \t},\n \t{\n@@ -1745,8 +1697,8 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.device_id = BNXT_ULP_DEVICE_ID_THOR,\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n-\t.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,\n-\t.count = 14\n+\t.resource_type = TF_TBL_TYPE_ACT_STATS_64,\n+\t.count = 1024\n \t},\n \t{\n \t.app_id = 1,\n@@ -1754,7 +1706,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_EM_FKB,\n-\t.count = 32\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 1,\n@@ -1762,7 +1714,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_WC_FKB,\n-\t.count = 32\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 1,\n@@ -1770,7 +1722,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_ACT_ENCAP_64B,\n-\t.count = 64\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 1,\n@@ -1778,7 +1730,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,\n-\t.count = 64\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 1,\n@@ -1786,7 +1738,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\n-\t.count = 300\n+\t.count = 32\n \t},\n \t{\n \t.app_id = 1,\n@@ -1794,7 +1746,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,\n-\t.count = 6\n+\t.count = 2\n \t},\n \t{\n \t.app_id = 1,\n@@ -1802,7 +1754,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM,\n-\t.count = 128\n+\t.count = 32\n \t},\n \t{\n \t.app_id = 1,\n@@ -1810,7 +1762,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_WC_TCAM,\n-\t.count = 112\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 1,\n@@ -1818,7 +1770,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,\n \t.resource_type = TF_EM_TBL_TYPE_EM_RECORD,\n-\t.count = 13200\n+\t.count = 1024\n \t},\n \t{\n \t.app_id = 1,\n@@ -1834,7 +1786,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n \t.resource_type = TF_IDENT_TYPE_L2_CTXT_LOW,\n-\t.count = 26\n+\t.count = 2\n \t},\n \t{\n \t.app_id = 1,\n@@ -1842,7 +1794,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n \t.resource_type = TF_IDENT_TYPE_WC_PROF,\n-\t.count = 32\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 1,\n@@ -1850,7 +1802,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n \t.resource_type = TF_IDENT_TYPE_PROF_FUNC,\n-\t.count = 63\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 1,\n@@ -1858,7 +1810,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n \t.resource_type = TF_IDENT_TYPE_EM_PROF,\n-\t.count = 32\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 1,\n@@ -1866,14 +1818,6 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,\n-\t.count = 1024\n-\t},\n-\t{\n-\t.app_id = 1,\n-\t.device_id = BNXT_ULP_DEVICE_ID_THOR,\n-\t.direction = TF_DIR_TX,\n-\t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n-\t.resource_type = TF_TBL_TYPE_ACT_STATS_64,\n \t.count = 512\n \t},\n \t{\n@@ -1881,8 +1825,8 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.device_id = BNXT_ULP_DEVICE_ID_THOR,\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n-\t.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,\n-\t.count = 14\n+\t.resource_type = TF_TBL_TYPE_ACT_STATS_64,\n+\t.count = 1024\n \t},\n \t{\n \t.app_id = 1,\n@@ -1890,7 +1834,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_EM_FKB,\n-\t.count = 32\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 1,\n@@ -1898,7 +1842,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_WC_FKB,\n-\t.count = 32\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 1,\n@@ -1906,7 +1850,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_ACT_ENCAP_64B,\n-\t.count = 64\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 1,\n@@ -1914,15 +1858,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,\n-\t.count = 100\n-\t},\n-\t{\n-\t.app_id = 1,\n-\t.device_id = BNXT_ULP_DEVICE_ID_THOR,\n-\t.direction = TF_DIR_TX,\n-\t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n-\t.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,\n-\t.count = 1\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 1,\n@@ -1930,7 +1866,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\n-\t.count = 200\n+\t.count = 32\n \t},\n \t{\n \t.app_id = 1,\n@@ -1938,7 +1874,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,\n-\t.count = 110\n+\t.count = 2\n \t},\n \t{\n \t.app_id = 1,\n@@ -1946,7 +1882,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM,\n-\t.count = 128\n+\t.count = 32\n \t},\n \t{\n \t.app_id = 1,\n@@ -1954,7 +1890,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_WC_TCAM,\n-\t.count = 128\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 1,\n@@ -1962,7 +1898,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,\n \t.resource_type = TF_EM_TBL_TYPE_EM_RECORD,\n-\t.count = 15232\n+\t.count = 1024\n \t},\n \t{\n \t.app_id = 2,\n@@ -1970,7 +1906,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n \t.resource_type = TF_IDENT_TYPE_L2_CTXT_HIGH,\n-\t.count = 422\n+\t.count = 32\n \t},\n \t{\n \t.app_id = 2,\n@@ -1978,7 +1914,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n \t.resource_type = TF_IDENT_TYPE_L2_CTXT_LOW,\n-\t.count = 6\n+\t.count = 2\n \t},\n \t{\n \t.app_id = 2,\n@@ -1986,7 +1922,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n \t.resource_type = TF_IDENT_TYPE_WC_PROF,\n-\t.count = 192\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 2,\n@@ -1994,7 +1930,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n \t.resource_type = TF_IDENT_TYPE_PROF_FUNC,\n-\t.count = 64\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 2,\n@@ -2002,7 +1938,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n \t.resource_type = TF_IDENT_TYPE_EM_PROF,\n-\t.count = 192\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 2,\n@@ -2010,7 +1946,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,\n-\t.count = 8192\n+\t.count = 512\n \t},\n \t{\n \t.app_id = 2,\n@@ -2018,7 +1954,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_ACT_STATS_64,\n-\t.count = 8192\n+\t.count = 1024\n \t},\n \t{\n \t.app_id = 2,\n@@ -2026,7 +1962,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_ACT_MODIFY_IPV4,\n-\t.count = 1023\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 2,\n@@ -2034,7 +1970,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_ACT_ENCAP_8B,\n-\t.count = 511\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 2,\n@@ -2042,7 +1978,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_ACT_ENCAP_16B,\n-\t.count = 63\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 2,\n@@ -2050,15 +1986,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_ACT_SP_SMAC,\n-\t.count = 255\n-\t},\n-\t{\n-\t.app_id = 2,\n-\t.device_id = BNXT_ULP_DEVICE_ID_WH_PLUS,\n-\t.direction = TF_DIR_RX,\n-\t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n-\t.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,\n-\t.count = 1\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 2,\n@@ -2066,7 +1994,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\n-\t.count = 422\n+\t.count = 32\n \t},\n \t{\n \t.app_id = 2,\n@@ -2074,7 +2002,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,\n-\t.count = 6\n+\t.count = 2\n \t},\n \t{\n \t.app_id = 2,\n@@ -2082,7 +2010,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM,\n-\t.count = 960\n+\t.count = 32\n \t},\n \t{\n \t.app_id = 2,\n@@ -2090,7 +2018,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_WC_TCAM,\n-\t.count = 88\n+\t.count = 128\n \t},\n \t{\n \t.app_id = 2,\n@@ -2098,15 +2026,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,\n \t.resource_type = TF_EM_TBL_TYPE_EM_RECORD,\n-\t.count = 13168\n-\t},\n-\t{\n-\t.app_id = 2,\n-\t.device_id = BNXT_ULP_DEVICE_ID_WH_PLUS,\n-\t.direction = TF_DIR_RX,\n-\t.resource_func = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,\n-\t.resource_type = TF_EM_TBL_TYPE_TBL_SCOPE,\n-\t.count = 1\n+\t.count = 1024\n \t},\n \t{\n \t.app_id = 2,\n@@ -2114,7 +2034,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n \t.resource_type = TF_IDENT_TYPE_L2_CTXT_HIGH,\n-\t.count = 292\n+\t.count = 32\n \t},\n \t{\n \t.app_id = 2,\n@@ -2122,7 +2042,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n \t.resource_type = TF_IDENT_TYPE_L2_CTXT_LOW,\n-\t.count = 148\n+\t.count = 2\n \t},\n \t{\n \t.app_id = 2,\n@@ -2130,7 +2050,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n \t.resource_type = TF_IDENT_TYPE_WC_PROF,\n-\t.count = 192\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 2,\n@@ -2138,7 +2058,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n \t.resource_type = TF_IDENT_TYPE_PROF_FUNC,\n-\t.count = 64\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 2,\n@@ -2146,7 +2066,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n \t.resource_type = TF_IDENT_TYPE_EM_PROF,\n-\t.count = 192\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 2,\n@@ -2154,7 +2074,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,\n-\t.count = 8192\n+\t.count = 512\n \t},\n \t{\n \t.app_id = 2,\n@@ -2162,7 +2082,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_ACT_STATS_64,\n-\t.count = 8192\n+\t.count = 1024\n \t},\n \t{\n \t.app_id = 2,\n@@ -2170,7 +2090,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_ACT_MODIFY_IPV4,\n-\t.count = 1023\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 2,\n@@ -2178,7 +2098,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_ACT_ENCAP_64B,\n-\t.count = 511\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 2,\n@@ -2186,7 +2106,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_ACT_ENCAP_16B,\n-\t.count = 223\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 2,\n@@ -2194,7 +2114,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_ACT_ENCAP_8B,\n-\t.count = 255\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 2,\n@@ -2202,7 +2122,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,\n-\t.count = 488\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 2,\n@@ -2210,15 +2130,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_ACT_SP_SMAC_IPV6,\n-\t.count = 511\n-\t},\n-\t{\n-\t.app_id = 2,\n-\t.device_id = BNXT_ULP_DEVICE_ID_WH_PLUS,\n-\t.direction = TF_DIR_TX,\n-\t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n-\t.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,\n-\t.count = 1\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 2,\n@@ -2226,7 +2138,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\n-\t.count = 292\n+\t.count = 32\n \t},\n \t{\n \t.app_id = 2,\n@@ -2234,7 +2146,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,\n-\t.count = 144\n+\t.count = 2\n \t},\n \t{\n \t.app_id = 2,\n@@ -2242,7 +2154,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM,\n-\t.count = 960\n+\t.count = 32\n \t},\n \t{\n \t.app_id = 2,\n@@ -2250,7 +2162,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_WC_TCAM,\n-\t.count = 928\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 2,\n@@ -2258,15 +2170,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,\n \t.resource_type = TF_EM_TBL_TYPE_EM_RECORD,\n-\t.count = 15232\n-\t},\n-\t{\n-\t.app_id = 2,\n-\t.device_id = BNXT_ULP_DEVICE_ID_WH_PLUS,\n-\t.direction = TF_DIR_TX,\n-\t.resource_func = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,\n-\t.resource_type = TF_EM_TBL_TYPE_TBL_SCOPE,\n-\t.count = 1\n+\t.count = 1024\n \t},\n \t{\n \t.app_id = 2,\n@@ -2274,7 +2178,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n \t.resource_type = TF_IDENT_TYPE_L2_CTXT_HIGH,\n-\t.count = 26\n+\t.count = 32\n \t},\n \t{\n \t.app_id = 2,\n@@ -2282,7 +2186,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n \t.resource_type = TF_IDENT_TYPE_L2_CTXT_LOW,\n-\t.count = 6\n+\t.count = 2\n \t},\n \t{\n \t.app_id = 2,\n@@ -2314,14 +2218,6 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,\n-\t.count = 1024\n-\t},\n-\t{\n-\t.app_id = 2,\n-\t.device_id = BNXT_ULP_DEVICE_ID_THOR,\n-\t.direction = TF_DIR_RX,\n-\t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n-\t.resource_type = TF_TBL_TYPE_ACT_STATS_64,\n \t.count = 512\n \t},\n \t{\n@@ -2329,8 +2225,8 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.device_id = BNXT_ULP_DEVICE_ID_THOR,\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n-\t.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,\n-\t.count = 14\n+\t.resource_type = TF_TBL_TYPE_ACT_STATS_64,\n+\t.count = 1024\n \t},\n \t{\n \t.app_id = 2,\n@@ -2338,7 +2234,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_EM_FKB,\n-\t.count = 32\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 2,\n@@ -2346,7 +2242,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_WC_FKB,\n-\t.count = 32\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 2,\n@@ -2354,7 +2250,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_ACT_ENCAP_64B,\n-\t.count = 64\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 2,\n@@ -2362,7 +2258,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,\n-\t.count = 64\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 2,\n@@ -2370,7 +2266,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\n-\t.count = 300\n+\t.count = 32\n \t},\n \t{\n \t.app_id = 2,\n@@ -2378,7 +2274,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,\n-\t.count = 6\n+\t.count = 2\n \t},\n \t{\n \t.app_id = 2,\n@@ -2386,7 +2282,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM,\n-\t.count = 128\n+\t.count = 32\n \t},\n \t{\n \t.app_id = 2,\n@@ -2394,7 +2290,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_WC_TCAM,\n-\t.count = 112\n+\t.count = 128\n \t},\n \t{\n \t.app_id = 2,\n@@ -2402,7 +2298,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_RX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,\n \t.resource_type = TF_EM_TBL_TYPE_EM_RECORD,\n-\t.count = 13200\n+\t.count = 1024\n \t},\n \t{\n \t.app_id = 2,\n@@ -2418,7 +2314,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n \t.resource_type = TF_IDENT_TYPE_L2_CTXT_LOW,\n-\t.count = 26\n+\t.count = 2\n \t},\n \t{\n \t.app_id = 2,\n@@ -2426,7 +2322,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n \t.resource_type = TF_IDENT_TYPE_WC_PROF,\n-\t.count = 32\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 2,\n@@ -2434,7 +2330,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n \t.resource_type = TF_IDENT_TYPE_PROF_FUNC,\n-\t.count = 63\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 2,\n@@ -2442,7 +2338,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n \t.resource_type = TF_IDENT_TYPE_EM_PROF,\n-\t.count = 32\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 2,\n@@ -2450,14 +2346,6 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,\n-\t.count = 1024\n-\t},\n-\t{\n-\t.app_id = 2,\n-\t.device_id = BNXT_ULP_DEVICE_ID_THOR,\n-\t.direction = TF_DIR_TX,\n-\t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n-\t.resource_type = TF_TBL_TYPE_ACT_STATS_64,\n \t.count = 512\n \t},\n \t{\n@@ -2465,8 +2353,8 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.device_id = BNXT_ULP_DEVICE_ID_THOR,\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n-\t.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,\n-\t.count = 14\n+\t.resource_type = TF_TBL_TYPE_ACT_STATS_64,\n+\t.count = 1024\n \t},\n \t{\n \t.app_id = 2,\n@@ -2474,7 +2362,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_EM_FKB,\n-\t.count = 32\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 2,\n@@ -2482,7 +2370,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_WC_FKB,\n-\t.count = 32\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 2,\n@@ -2490,7 +2378,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_ACT_ENCAP_64B,\n-\t.count = 64\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 2,\n@@ -2498,15 +2386,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,\n-\t.count = 100\n-\t},\n-\t{\n-\t.app_id = 2,\n-\t.device_id = BNXT_ULP_DEVICE_ID_THOR,\n-\t.direction = TF_DIR_TX,\n-\t.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n-\t.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,\n-\t.count = 1\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 2,\n@@ -2514,7 +2394,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\n-\t.count = 200\n+\t.count = 32\n \t},\n \t{\n \t.app_id = 2,\n@@ -2522,7 +2402,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,\n-\t.count = 110\n+\t.count = 2\n \t},\n \t{\n \t.app_id = 2,\n@@ -2530,7 +2410,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM,\n-\t.count = 128\n+\t.count = 32\n \t},\n \t{\n \t.app_id = 2,\n@@ -2538,7 +2418,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type = TF_TCAM_TBL_TYPE_WC_TCAM,\n-\t.count = 128\n+\t.count = 4\n \t},\n \t{\n \t.app_id = 2,\n@@ -2546,7 +2426,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.direction = TF_DIR_TX,\n \t.resource_func = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,\n \t.resource_type = TF_EM_TBL_TYPE_EM_RECORD,\n-\t.count = 15232\n+\t.count = 1024\n \t}\n };\n \n@@ -2635,6 +2515,8 @@ uint32_t ulp_act_prop_map_table[] = {\n \t\tBNXT_ULP_ACT_PROP_SZ_JUMP,\n \t[BNXT_ULP_ACT_PROP_IDX_SHARED_HANDLE] =\n \t\tBNXT_ULP_ACT_PROP_SZ_SHARED_HANDLE,\n+\t[BNXT_ULP_ACT_PROP_IDX_RSS] =\n+\t\tBNXT_ULP_ACT_PROP_SZ_RSS,\n \t[BNXT_ULP_ACT_PROP_IDX_LAST] =\n \t\tBNXT_ULP_ACT_PROP_SZ_LAST\n };\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_thor_class.c b/drivers/net/bnxt/tf_ulp/ulp_template_db_thor_class.c\nindex d20e630980..5e7ba75c62 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_template_db_thor_class.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_thor_class.c\n@@ -357,8 +357,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_CF_IDX_DRV_FUNC_VNIC >> 8) & 0xff,\n-\t\tBNXT_ULP_CF_IDX_DRV_FUNC_VNIC & 0xff}\n+\t(BNXT_ULP_CF_IDX_DRV_FUNC_VNIC >> 8) & 0xff,\n+\tBNXT_ULP_CF_IDX_DRV_FUNC_VNIC & 0xff}\n \t},\n \t{\n \t.description = \"use_default\",\n@@ -402,7 +402,7 @@ struct bnxt_ulp_mapper_field_info ulp_thor_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t/* class_tid: 3, thor, table: parif_def_arec_ptr.ing_0 */\n \t{\n@@ -411,8 +411,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n+\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n \t},\n \t/* class_tid: 3, thor, table: parif_def_err_arec_ptr.ing_0 */\n \t{\n@@ -421,8 +421,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n+\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n \t},\n \t/* class_tid: 3, thor, table: int_full_act_record.egr_vfr */\n \t{\n@@ -485,8 +485,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_CF_IDX_PHY_PORT_VPORT >> 8) & 0xff,\n-\t\tBNXT_ULP_CF_IDX_PHY_PORT_VPORT & 0xff}\n+\t(BNXT_ULP_CF_IDX_PHY_PORT_VPORT >> 8) & 0xff,\n+\tBNXT_ULP_CF_IDX_PHY_PORT_VPORT & 0xff}\n \t},\n \t{\n \t.description = \"use_default\",\n@@ -530,7 +530,7 @@ struct bnxt_ulp_mapper_field_info ulp_thor_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t/* class_tid: 3, thor, table: parif_def_arec_ptr.egr_0 */\n \t{\n@@ -539,8 +539,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n+\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n \t},\n \t/* class_tid: 3, thor, table: parif_def_err_arec_ptr.egr_0 */\n \t{\n@@ -549,8 +549,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n+\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n \t},\n \t/* class_tid: 4, thor, table: int_full_act_record.loopback */\n \t{\n@@ -613,8 +613,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t(ULP_THOR_SYM_LOOPBACK_PORT >> 8) & 0xff,\n-\t\tULP_THOR_SYM_LOOPBACK_PORT & 0xff}\n+\t(ULP_THOR_SYM_LOOPBACK_PORT >> 8) & 0xff,\n+\tULP_THOR_SYM_LOOPBACK_PORT & 0xff}\n \t},\n \t{\n \t.description = \"use_default\",\n@@ -658,7 +658,7 @@ struct bnxt_ulp_mapper_field_info ulp_thor_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t/* class_tid: 4, thor, table: parif_def_arec_ptr.vf_egr */\n \t{\n@@ -667,8 +667,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR >> 8) & 0xff,\n-\t\tBNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR & 0xff}\n+\t(BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR >> 8) & 0xff,\n+\tBNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR & 0xff}\n \t},\n \t/* class_tid: 4, thor, table: parif_def_err_arec_ptr.vf_egr */\n \t{\n@@ -677,8 +677,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR >> 8) & 0xff,\n-\t\tBNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR & 0xff}\n+\t(BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR >> 8) & 0xff,\n+\tBNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR & 0xff}\n \t},\n \t/* class_tid: 4, thor, table: int_full_act_record.vf_ing */\n \t{\n@@ -741,8 +741,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_CF_IDX_DRV_FUNC_VNIC >> 8) & 0xff,\n-\t\tBNXT_ULP_CF_IDX_DRV_FUNC_VNIC & 0xff}\n+\t(BNXT_ULP_CF_IDX_DRV_FUNC_VNIC >> 8) & 0xff,\n+\tBNXT_ULP_CF_IDX_DRV_FUNC_VNIC & 0xff}\n \t},\n \t{\n \t.description = \"use_default\",\n@@ -786,7 +786,7 @@ struct bnxt_ulp_mapper_field_info ulp_thor_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t/* class_tid: 4, thor, table: vtag_encap_record.vfr_egr0 */\n \t{\n@@ -819,7 +819,7 @@ struct bnxt_ulp_mapper_field_info ulp_thor_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\tULP_THOR_SYM_ECV_VTAG_TYPE_ADD_1_ENCAP_PRI}\n+\tULP_THOR_SYM_ECV_VTAG_TYPE_ADD_1_ENCAP_PRI}\n \t},\n \t{\n \t.description = \"rsrvd\",\n@@ -833,7 +833,7 @@ struct bnxt_ulp_mapper_field_info ulp_thor_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"vtag_tpid\",\n@@ -850,8 +850,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_CF_IDX_DEV_PORT_ID >> 8) & 0xff,\n-\t\tBNXT_ULP_CF_IDX_DEV_PORT_ID & 0xff}\n+\t(BNXT_ULP_CF_IDX_DEV_PORT_ID >> 8) & 0xff,\n+\tBNXT_ULP_CF_IDX_DEV_PORT_ID & 0xff}\n \t},\n \t{\n \t.description = \"vtag_de\",\n@@ -865,8 +865,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_ACT_PROP_IDX_SET_VLAN_PCP >> 8) & 0xff,\n-\t\tBNXT_ULP_ACT_PROP_IDX_SET_VLAN_PCP & 0xff}\n+\t(BNXT_ULP_ACT_PROP_IDX_SET_VLAN_PCP >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_SET_VLAN_PCP & 0xff}\n \t},\n \t/* class_tid: 4, thor, table: int_full_act_record.vfr_egr0 */\n \t{\n@@ -881,8 +881,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_ENCAP_PTR_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_ENCAP_PTR_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_ENCAP_PTR_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_ENCAP_PTR_0 & 0xff}\n \t},\n \t{\n \t.description = \"mod_rec_ptr\",\n@@ -932,8 +932,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t(ULP_THOR_SYM_LOOPBACK_PORT >> 8) & 0xff,\n-\t\tULP_THOR_SYM_LOOPBACK_PORT & 0xff}\n+\t(ULP_THOR_SYM_LOOPBACK_PORT >> 8) & 0xff,\n+\tULP_THOR_SYM_LOOPBACK_PORT & 0xff}\n \t},\n \t{\n \t.description = \"use_default\",\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 1d21cd3e38..9e0a6b5c18 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@@ -3,7 +3,7 @@\n * All rights reserved.\n */\n \n-/* date: Sun Mar 14 12:41:59 2021 */\n+/* date: Sun Mar 21 13:04:51 2021 */\n \n #include \"ulp_template_db_enum.h\"\n #include \"ulp_template_db_field.h\"\n@@ -997,8 +997,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_act_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_ACT_PROP_IDX_SHARED_HANDLE >> 8) & 0xff,\n-\t\t\tBNXT_ULP_ACT_PROP_IDX_SHARED_HANDLE & 0xff}\n+\t\t(BNXT_ULP_ACT_PROP_IDX_SHARED_HANDLE >> 8) & 0xff,\n+\t\tBNXT_ULP_ACT_PROP_IDX_SHARED_HANDLE & 0xff}\n \t\t}\n \t},\n \t/* act_tid: 2, wh_plus, table: shared_mirror_record.wr */\n@@ -1017,8 +1017,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_act_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_RF_IDX_MIRROR_PTR_0 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_RF_IDX_MIRROR_PTR_0 & 0xff}\n+\t\t(BNXT_ULP_RF_IDX_MIRROR_PTR_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_RF_IDX_MIRROR_PTR_0 & 0xff}\n \t\t}\n \t}\n };\n@@ -1062,7 +1062,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\tULP_WP_SYM_ECV_VTAG_TYPE_ADD_1_ENCAP_PRI}\n+\tULP_WP_SYM_ECV_VTAG_TYPE_ADD_1_ENCAP_PRI}\n \t},\n \t{\n \t.description = \"ecv_custom_en\",\n@@ -1076,7 +1076,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"vtag_tpid\",\n@@ -1084,8 +1084,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_ACT_PROP_IDX_PUSH_VLAN >> 8) & 0xff,\n-\t\tBNXT_ULP_ACT_PROP_IDX_PUSH_VLAN & 0xff}\n+\t(BNXT_ULP_ACT_PROP_IDX_PUSH_VLAN >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_PUSH_VLAN & 0xff}\n \t},\n \t{\n \t.description = \"vtag_vid\",\n@@ -1093,8 +1093,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_ACT_PROP_IDX_SET_VLAN_VID >> 8) & 0xff,\n-\t\tBNXT_ULP_ACT_PROP_IDX_SET_VLAN_VID & 0xff}\n+\t(BNXT_ULP_ACT_PROP_IDX_SET_VLAN_VID >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_SET_VLAN_VID & 0xff}\n \t},\n \t{\n \t.description = \"vtag_de\",\n@@ -1108,8 +1108,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_ACT_PROP_IDX_SET_VLAN_PCP >> 8) & 0xff,\n-\t\tBNXT_ULP_ACT_PROP_IDX_SET_VLAN_PCP & 0xff}\n+\t(BNXT_ULP_ACT_PROP_IDX_SET_VLAN_PCP >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_SET_VLAN_PCP & 0xff}\n \t},\n \t{\n \t.description = \"spare\",\n@@ -1124,8 +1124,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 & 0xff}\n \t},\n \t{\n \t.description = \"age_enable\",\n@@ -1151,14 +1151,14 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,\n \t.field_opr1 = {\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 56) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 48) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 40) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 32) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 24) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 16) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 8) & 0xff,\n-\t\t(uint64_t)BNXT_ULP_ACT_BIT_COUNT & 0xff}\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 56) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 48) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 40) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 32) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 24) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 16) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 8) & 0xff,\n+\t(uint64_t)BNXT_ULP_ACT_BIT_COUNT & 0xff}\n \t},\n \t{\n \t.description = \"tcpflags_key\",\n@@ -1184,8 +1184,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_ENCAP_PTR_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_ENCAP_PTR_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_ENCAP_PTR_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_ENCAP_PTR_0 & 0xff}\n \t},\n \t{\n \t.description = \"dst_ip_ptr\",\n@@ -1193,8 +1193,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 & 0xff}\n \t},\n \t{\n \t.description = \"tcp_dst_port\",\n@@ -1202,14 +1202,14 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,\n \t.field_opr1 = {\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 56) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 48) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 40) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 32) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 24) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 16) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 8) & 0xff,\n-\t\t(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST & 0xff},\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 56) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 48) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 40) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 32) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 24) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 16) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 8) & 0xff,\n+\t(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr2 = {\n \t\t(BNXT_ULP_ACT_PROP_IDX_SET_TP_DST >> 8) & 0xff,\n@@ -1222,8 +1222,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 & 0xff}\n \t},\n \t{\n \t.description = \"tcp_src_port\",\n@@ -1231,14 +1231,14 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,\n \t.field_opr1 = {\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 56) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 48) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 40) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 32) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 24) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 16) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 8) & 0xff,\n-\t\t(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC & 0xff},\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 56) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 48) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 40) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 32) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 24) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 16) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 8) & 0xff,\n+\t(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr2 = {\n \t\t(BNXT_ULP_ACT_PROP_IDX_SET_TP_SRC >> 8) & 0xff,\n@@ -1269,8 +1269,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_CF_IDX_ACT_DEC_TTL >> 8) & 0xff,\n-\t\tBNXT_ULP_CF_IDX_ACT_DEC_TTL & 0xff}\n+\t(BNXT_ULP_CF_IDX_ACT_DEC_TTL >> 8) & 0xff,\n+\tBNXT_ULP_CF_IDX_ACT_DEC_TTL & 0xff}\n \t},\n \t{\n \t.description = \"tl3_ttl_dec\",\n@@ -1278,8 +1278,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_CF_IDX_ACT_T_DEC_TTL >> 8) & 0xff,\n-\t\tBNXT_ULP_CF_IDX_ACT_T_DEC_TTL & 0xff}\n+\t(BNXT_ULP_CF_IDX_ACT_T_DEC_TTL >> 8) & 0xff,\n+\tBNXT_ULP_CF_IDX_ACT_T_DEC_TTL & 0xff}\n \t},\n \t{\n \t.description = \"decap_func\",\n@@ -1287,20 +1287,20 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,\n \t.field_opr1 = {\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 56) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 48) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 40) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 32) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 24) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 16) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 8) & 0xff,\n-\t\t(uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP & 0xff},\n+\t((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 56) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 48) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 40) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 32) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 24) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 16) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 8) & 0xff,\n+\t(uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr2 = {\n \t\tULP_WP_SYM_DECAP_FUNC_THRU_TUN},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr3 = {\n-\t\tULP_WP_SYM_DECAP_FUNC_NONE}\n+\tULP_WP_SYM_DECAP_FUNC_NONE}\n \t},\n \t{\n \t.description = \"vnic_or_vport\",\n@@ -1308,8 +1308,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_ACT_PROP_IDX_VNIC >> 8) & 0xff,\n-\t\tBNXT_ULP_ACT_PROP_IDX_VNIC & 0xff}\n+\t(BNXT_ULP_ACT_PROP_IDX_VNIC >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_VNIC & 0xff}\n \t},\n \t{\n \t.description = \"pop_vlan\",\n@@ -1317,14 +1317,14 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,\n \t.field_opr1 = {\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 56) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 48) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 40) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 32) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 24) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 16) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 8) & 0xff,\n-\t\t(uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN & 0xff}\n+\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 56) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 48) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 40) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 32) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 24) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 16) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 8) & 0xff,\n+\t(uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN & 0xff}\n \t},\n \t{\n \t.description = \"meter\",\n@@ -1338,14 +1338,14 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,\n \t.field_opr1 = {\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SHARED_SAMPLE >> 56) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SHARED_SAMPLE >> 48) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SHARED_SAMPLE >> 40) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SHARED_SAMPLE >> 32) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SHARED_SAMPLE >> 24) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SHARED_SAMPLE >> 16) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SHARED_SAMPLE >> 8) & 0xff,\n-\t\t(uint64_t)BNXT_ULP_ACT_BIT_SHARED_SAMPLE & 0xff},\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SHARED_SAMPLE >> 56) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SHARED_SAMPLE >> 48) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SHARED_SAMPLE >> 40) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SHARED_SAMPLE >> 32) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SHARED_SAMPLE >> 24) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SHARED_SAMPLE >> 16) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SHARED_SAMPLE >> 8) & 0xff,\n+\t(uint64_t)BNXT_ULP_ACT_BIT_SHARED_SAMPLE & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr2 = {\n \t\t(BNXT_ULP_RF_IDX_MIRROR_ID_0 >> 8) & 0xff,\n@@ -1358,14 +1358,14 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,\n \t.field_opr1 = {\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 56) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 48) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 40) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 32) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 24) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 16) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 8) & 0xff,\n-\t\t(uint64_t)BNXT_ULP_ACT_BIT_DROP & 0xff}\n+\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 56) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 48) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 40) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 32) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 24) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 16) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 8) & 0xff,\n+\t(uint64_t)BNXT_ULP_ACT_BIT_DROP & 0xff}\n \t},\n \t{\n \t.description = \"hit\",\n@@ -1386,8 +1386,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 & 0xff}\n \t},\n \t{\n \t.description = \"age_enable\",\n@@ -1413,14 +1413,14 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,\n \t.field_opr1 = {\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 56) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 48) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 40) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 32) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 24) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 16) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 8) & 0xff,\n-\t\t(uint64_t)BNXT_ULP_ACT_BIT_COUNT & 0xff}\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 56) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 48) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 40) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 32) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 24) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 16) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 8) & 0xff,\n+\t(uint64_t)BNXT_ULP_ACT_BIT_COUNT & 0xff}\n \t},\n \t{\n \t.description = \"flow_cntr_ext\",\n@@ -1464,8 +1464,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 & 0xff}\n \t},\n \t{\n \t.description = \"tcp_dst_port\",\n@@ -1473,14 +1473,14 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,\n \t.field_opr1 = {\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 56) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 48) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 40) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 32) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 24) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 16) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 8) & 0xff,\n-\t\t(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST & 0xff},\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 56) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 48) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 40) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 32) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 24) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 16) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 8) & 0xff,\n+\t(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr2 = {\n \t\t(BNXT_ULP_ACT_PROP_IDX_SET_TP_DST >> 8) & 0xff,\n@@ -1493,8 +1493,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 & 0xff}\n \t},\n \t{\n \t.description = \"tcp_src_port\",\n@@ -1502,14 +1502,14 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,\n \t.field_opr1 = {\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 56) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 48) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 40) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 32) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 24) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 16) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 8) & 0xff,\n-\t\t(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC & 0xff},\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 56) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 48) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 40) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 32) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 24) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 16) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 8) & 0xff,\n+\t(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr2 = {\n \t\t(BNXT_ULP_ACT_PROP_IDX_SET_TP_SRC >> 8) & 0xff,\n@@ -1540,8 +1540,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_CF_IDX_ACT_DEC_TTL >> 8) & 0xff,\n-\t\tBNXT_ULP_CF_IDX_ACT_DEC_TTL & 0xff}\n+\t(BNXT_ULP_CF_IDX_ACT_DEC_TTL >> 8) & 0xff,\n+\tBNXT_ULP_CF_IDX_ACT_DEC_TTL & 0xff}\n \t},\n \t{\n \t.description = \"tl3_ttl_dec\",\n@@ -1549,8 +1549,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_CF_IDX_ACT_T_DEC_TTL >> 8) & 0xff,\n-\t\tBNXT_ULP_CF_IDX_ACT_T_DEC_TTL & 0xff}\n+\t(BNXT_ULP_CF_IDX_ACT_T_DEC_TTL >> 8) & 0xff,\n+\tBNXT_ULP_CF_IDX_ACT_T_DEC_TTL & 0xff}\n \t},\n \t{\n \t.description = \"decap_func\",\n@@ -1558,20 +1558,20 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,\n \t.field_opr1 = {\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 56) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 48) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 40) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 32) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 24) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 16) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 8) & 0xff,\n-\t\t(uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP & 0xff},\n+\t((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 56) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 48) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 40) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 32) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 24) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 16) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 8) & 0xff,\n+\t(uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr2 = {\n \t\tULP_WP_SYM_DECAP_FUNC_THRU_TUN},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr3 = {\n-\t\tULP_WP_SYM_DECAP_FUNC_NONE}\n+\tULP_WP_SYM_DECAP_FUNC_NONE}\n \t},\n \t{\n \t.description = \"vnic_or_vport\",\n@@ -1579,8 +1579,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_ACT_PROP_IDX_VNIC >> 8) & 0xff,\n-\t\tBNXT_ULP_ACT_PROP_IDX_VNIC & 0xff}\n+\t(BNXT_ULP_ACT_PROP_IDX_VNIC >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_VNIC & 0xff}\n \t},\n \t{\n \t.description = \"pop_vlan\",\n@@ -1588,14 +1588,14 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,\n \t.field_opr1 = {\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 56) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 48) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 40) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 32) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 24) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 16) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 8) & 0xff,\n-\t\t(uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN & 0xff}\n+\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 56) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 48) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 40) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 32) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 24) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 16) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 8) & 0xff,\n+\t(uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN & 0xff}\n \t},\n \t{\n \t.description = \"meter\",\n@@ -1609,8 +1609,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_MIRROR_ID_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_MIRROR_ID_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_MIRROR_ID_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_MIRROR_ID_0 & 0xff}\n \t},\n \t{\n \t.description = \"drop\",\n@@ -1618,14 +1618,14 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,\n \t.field_opr1 = {\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 56) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 48) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 40) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 32) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 24) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 16) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 8) & 0xff,\n-\t\t(uint64_t)BNXT_ULP_ACT_BIT_DROP & 0xff}\n+\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 56) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 48) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 40) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 32) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 24) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 16) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 8) & 0xff,\n+\t(uint64_t)BNXT_ULP_ACT_BIT_DROP & 0xff}\n \t},\n \t{\n \t.description = \"ecv_tun_type\",\n@@ -1651,7 +1651,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\tULP_WP_SYM_ECV_L2_EN_YES}\n+\tULP_WP_SYM_ECV_L2_EN_YES}\n \t},\n \t{\n \t.description = \"ecv_vtag_type\",\n@@ -1714,7 +1714,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"copy\",\n@@ -1754,8 +1754,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 & 0xff}\n \t},\n \t{\n \t.description = \"age_enable\",\n@@ -1781,14 +1781,14 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,\n \t.field_opr1 = {\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 56) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 48) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 40) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 32) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 24) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 16) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 8) & 0xff,\n-\t\t(uint64_t)BNXT_ULP_ACT_BIT_COUNT & 0xff}\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 56) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 48) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 40) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 32) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 24) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 16) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 8) & 0xff,\n+\t(uint64_t)BNXT_ULP_ACT_BIT_COUNT & 0xff}\n \t},\n \t{\n \t.description = \"tcpflags_key\",\n@@ -1880,8 +1880,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_ACT_PROP_IDX_VNIC >> 8) & 0xff,\n-\t\tBNXT_ULP_ACT_PROP_IDX_VNIC & 0xff}\n+\t(BNXT_ULP_ACT_PROP_IDX_VNIC >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_VNIC & 0xff}\n \t},\n \t{\n \t.description = \"pop_vlan\",\n@@ -1928,8 +1928,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 & 0xff}\n \t},\n \t{\n \t.description = \"age_enable\",\n@@ -1955,14 +1955,14 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,\n \t.field_opr1 = {\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 56) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 48) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 40) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 32) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 24) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 16) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 8) & 0xff,\n-\t\t(uint64_t)BNXT_ULP_ACT_BIT_COUNT & 0xff}\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 56) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 48) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 40) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 32) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 24) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 16) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 8) & 0xff,\n+\t(uint64_t)BNXT_ULP_ACT_BIT_COUNT & 0xff}\n \t},\n \t{\n \t.description = \"flow_cntr_ext\",\n@@ -2066,8 +2066,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_ACT_PROP_IDX_VNIC >> 8) & 0xff,\n-\t\tBNXT_ULP_ACT_PROP_IDX_VNIC & 0xff}\n+\t(BNXT_ULP_ACT_PROP_IDX_VNIC >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_VNIC & 0xff}\n \t},\n \t{\n \t.description = \"pop_vlan\",\n@@ -2075,14 +2075,14 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,\n \t.field_opr1 = {\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 56) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 48) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 40) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 32) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 24) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 16) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 8) & 0xff,\n-\t\t(uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN & 0xff}\n+\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 56) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 48) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 40) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 32) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 24) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 16) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 8) & 0xff,\n+\t(uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN & 0xff}\n \t},\n \t{\n \t.description = \"meter\",\n@@ -2128,7 +2128,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\tULP_WP_SYM_ECV_L2_EN_YES}\n+\tULP_WP_SYM_ECV_L2_EN_YES}\n \t},\n \t{\n \t.description = \"ecv_vtag_type\",\n@@ -2185,8 +2185,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n+\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n \t},\n \t{\n \t.description = \"enable\",\n@@ -2194,7 +2194,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"copy\",\n@@ -2227,8 +2227,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_RID >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_RID & 0xff}\n+\t(BNXT_ULP_RF_IDX_RID >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_RID & 0xff}\n \t},\n \t{\n \t.description = \"mirror_id\",\n@@ -2253,8 +2253,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_ACT_PROP_IDX_SET_IPV4_SRC >> 8) & 0xff,\n-\t\tBNXT_ULP_ACT_PROP_IDX_SET_IPV4_SRC & 0xff}\n+\t(BNXT_ULP_ACT_PROP_IDX_SET_IPV4_SRC >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_SET_IPV4_SRC & 0xff}\n \t},\n \t/* act_tid: 3, wh_plus, table: act_modify_ipv4_dst.0 */\n \t{\n@@ -2263,8 +2263,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_ACT_PROP_IDX_SET_IPV4_DST >> 8) & 0xff,\n-\t\tBNXT_ULP_ACT_PROP_IDX_SET_IPV4_DST & 0xff}\n+\t(BNXT_ULP_ACT_PROP_IDX_SET_IPV4_DST >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_SET_IPV4_DST & 0xff}\n \t},\n \t/* act_tid: 3, wh_plus, table: int_encap_mac_record.0 */\n \t{\n@@ -2291,7 +2291,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\tULP_WP_SYM_ECV_L2_EN_YES}\n+\tULP_WP_SYM_ECV_L2_EN_YES}\n \t},\n \t{\n \t.description = \"ecv_vtag_type\",\n@@ -2311,7 +2311,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"vtag_tpid\",\n@@ -2350,8 +2350,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 & 0xff}\n \t},\n \t{\n \t.description = \"age_enable\",\n@@ -2377,14 +2377,14 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,\n \t.field_opr1 = {\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 56) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 48) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 40) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 32) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 24) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 16) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 8) & 0xff,\n-\t\t(uint64_t)BNXT_ULP_ACT_BIT_COUNT & 0xff}\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 56) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 48) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 40) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 32) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 24) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 16) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 8) & 0xff,\n+\t(uint64_t)BNXT_ULP_ACT_BIT_COUNT & 0xff}\n \t},\n \t{\n \t.description = \"tcpflags_key\",\n@@ -2410,8 +2410,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR >> 8) & 0xff,\n-\t\tBNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR & 0xff}\n+\t(BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR >> 8) & 0xff,\n+\tBNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR & 0xff}\n \t},\n \t{\n \t.description = \"dst_ip_ptr\",\n@@ -2419,8 +2419,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 & 0xff}\n \t},\n \t{\n \t.description = \"tcp_dst_port\",\n@@ -2428,14 +2428,14 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,\n \t.field_opr1 = {\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 56) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 48) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 40) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 32) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 24) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 16) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 8) & 0xff,\n-\t\t(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST & 0xff},\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 56) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 48) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 40) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 32) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 24) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 16) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 8) & 0xff,\n+\t(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr2 = {\n \t\t(BNXT_ULP_ACT_PROP_IDX_SET_TP_DST >> 8) & 0xff,\n@@ -2448,8 +2448,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 & 0xff}\n \t},\n \t{\n \t.description = \"tcp_src_port\",\n@@ -2457,14 +2457,14 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,\n \t.field_opr1 = {\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 56) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 48) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 40) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 32) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 24) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 16) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 8) & 0xff,\n-\t\t(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC & 0xff},\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 56) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 48) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 40) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 32) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 24) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 16) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 8) & 0xff,\n+\t(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr2 = {\n \t\t(BNXT_ULP_ACT_PROP_IDX_SET_TP_SRC >> 8) & 0xff,\n@@ -2495,8 +2495,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_CF_IDX_ACT_DEC_TTL >> 8) & 0xff,\n-\t\tBNXT_ULP_CF_IDX_ACT_DEC_TTL & 0xff}\n+\t(BNXT_ULP_CF_IDX_ACT_DEC_TTL >> 8) & 0xff,\n+\tBNXT_ULP_CF_IDX_ACT_DEC_TTL & 0xff}\n \t},\n \t{\n \t.description = \"tl3_ttl_dec\",\n@@ -2504,8 +2504,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_CF_IDX_ACT_T_DEC_TTL >> 8) & 0xff,\n-\t\tBNXT_ULP_CF_IDX_ACT_T_DEC_TTL & 0xff}\n+\t(BNXT_ULP_CF_IDX_ACT_T_DEC_TTL >> 8) & 0xff,\n+\tBNXT_ULP_CF_IDX_ACT_T_DEC_TTL & 0xff}\n \t},\n \t{\n \t.description = \"decap_func\",\n@@ -2513,20 +2513,20 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,\n \t.field_opr1 = {\n-\t\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 56) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 48) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 40) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 32) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 24) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 16) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 8) & 0xff,\n-\t\t(uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN & 0xff},\n+\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 56) & 0xff,\n+\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 48) & 0xff,\n+\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 40) & 0xff,\n+\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 32) & 0xff,\n+\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 24) & 0xff,\n+\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 16) & 0xff,\n+\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 8) & 0xff,\n+\t(uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr2 = {\n \t\tULP_WP_SYM_DECAP_FUNC_THRU_TL2},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr3 = {\n-\t\tULP_WP_SYM_DECAP_FUNC_THRU_L2}\n+\tULP_WP_SYM_DECAP_FUNC_THRU_L2}\n \t},\n \t{\n \t.description = \"vnic_or_vport\",\n@@ -2534,8 +2534,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_ACT_PROP_IDX_VNIC >> 8) & 0xff,\n-\t\tBNXT_ULP_ACT_PROP_IDX_VNIC & 0xff}\n+\t(BNXT_ULP_ACT_PROP_IDX_VNIC >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_VNIC & 0xff}\n \t},\n \t{\n \t.description = \"pop_vlan\",\n@@ -2580,8 +2580,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 & 0xff}\n \t},\n \t{\n \t.description = \"age_enable\",\n@@ -2607,14 +2607,14 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,\n \t.field_opr1 = {\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 56) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 48) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 40) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 32) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 24) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 16) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 8) & 0xff,\n-\t\t(uint64_t)BNXT_ULP_ACT_BIT_COUNT & 0xff}\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 56) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 48) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 40) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 32) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 24) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 16) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 8) & 0xff,\n+\t(uint64_t)BNXT_ULP_ACT_BIT_COUNT & 0xff}\n \t},\n \t{\n \t.description = \"flow_cntr_ext\",\n@@ -2646,8 +2646,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR >> 8) & 0xff,\n-\t\tBNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR & 0xff}\n+\t(BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR >> 8) & 0xff,\n+\tBNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR & 0xff}\n \t},\n \t{\n \t.description = \"encap_rec_int\",\n@@ -2655,7 +2655,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"dst_ip_ptr\",\n@@ -2663,8 +2663,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 & 0xff}\n \t},\n \t{\n \t.description = \"tcp_dst_port\",\n@@ -2672,14 +2672,14 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,\n \t.field_opr1 = {\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 56) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 48) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 40) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 32) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 24) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 16) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 8) & 0xff,\n-\t\t(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST & 0xff},\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 56) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 48) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 40) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 32) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 24) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 16) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 8) & 0xff,\n+\t(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr2 = {\n \t\t(BNXT_ULP_ACT_PROP_IDX_SET_TP_DST >> 8) & 0xff,\n@@ -2692,8 +2692,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 & 0xff}\n \t},\n \t{\n \t.description = \"tcp_src_port\",\n@@ -2701,14 +2701,14 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,\n \t.field_opr1 = {\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 56) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 48) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 40) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 32) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 24) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 16) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 8) & 0xff,\n-\t\t(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC & 0xff},\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 56) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 48) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 40) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 32) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 24) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 16) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 8) & 0xff,\n+\t(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr2 = {\n \t\t(BNXT_ULP_ACT_PROP_IDX_SET_TP_SRC >> 8) & 0xff,\n@@ -2739,8 +2739,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_CF_IDX_ACT_DEC_TTL >> 8) & 0xff,\n-\t\tBNXT_ULP_CF_IDX_ACT_DEC_TTL & 0xff}\n+\t(BNXT_ULP_CF_IDX_ACT_DEC_TTL >> 8) & 0xff,\n+\tBNXT_ULP_CF_IDX_ACT_DEC_TTL & 0xff}\n \t},\n \t{\n \t.description = \"tl3_ttl_dec\",\n@@ -2748,8 +2748,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_CF_IDX_ACT_T_DEC_TTL >> 8) & 0xff,\n-\t\tBNXT_ULP_CF_IDX_ACT_T_DEC_TTL & 0xff}\n+\t(BNXT_ULP_CF_IDX_ACT_T_DEC_TTL >> 8) & 0xff,\n+\tBNXT_ULP_CF_IDX_ACT_T_DEC_TTL & 0xff}\n \t},\n \t{\n \t.description = \"decap_func\",\n@@ -2757,20 +2757,20 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,\n \t.field_opr1 = {\n-\t\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 56) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 48) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 40) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 32) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 24) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 16) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 8) & 0xff,\n-\t\t(uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN & 0xff},\n+\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 56) & 0xff,\n+\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 48) & 0xff,\n+\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 40) & 0xff,\n+\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 32) & 0xff,\n+\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 24) & 0xff,\n+\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 16) & 0xff,\n+\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 8) & 0xff,\n+\t(uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr2 = {\n \t\tULP_WP_SYM_DECAP_FUNC_THRU_TL2},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr3 = {\n-\t\tULP_WP_SYM_DECAP_FUNC_THRU_L2}\n+\tULP_WP_SYM_DECAP_FUNC_THRU_L2}\n \t},\n \t{\n \t.description = \"vnic_or_vport\",\n@@ -2778,8 +2778,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_ACT_PROP_IDX_VNIC >> 8) & 0xff,\n-\t\tBNXT_ULP_ACT_PROP_IDX_VNIC & 0xff}\n+\t(BNXT_ULP_ACT_PROP_IDX_VNIC >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_VNIC & 0xff}\n \t},\n \t{\n \t.description = \"pop_vlan\",\n@@ -2829,7 +2829,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\tULP_WP_SYM_ECV_L2_EN_YES}\n+\tULP_WP_SYM_ECV_L2_EN_YES}\n \t},\n \t{\n \t.description = \"ecv_vtag_type\",\n@@ -2917,7 +2917,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\tULP_WP_SYM_ECV_VTAG_TYPE_ADD_1_ENCAP_PRI}\n+\tULP_WP_SYM_ECV_VTAG_TYPE_ADD_1_ENCAP_PRI}\n \t},\n \t{\n \t.description = \"ecv_custom_en\",\n@@ -2931,7 +2931,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"vtag_tpid\",\n@@ -2939,8 +2939,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_ACT_PROP_IDX_PUSH_VLAN >> 8) & 0xff,\n-\t\tBNXT_ULP_ACT_PROP_IDX_PUSH_VLAN & 0xff}\n+\t(BNXT_ULP_ACT_PROP_IDX_PUSH_VLAN >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_PUSH_VLAN & 0xff}\n \t},\n \t{\n \t.description = \"vtag_vid\",\n@@ -2948,8 +2948,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_ACT_PROP_IDX_SET_VLAN_VID >> 8) & 0xff,\n-\t\tBNXT_ULP_ACT_PROP_IDX_SET_VLAN_VID & 0xff}\n+\t(BNXT_ULP_ACT_PROP_IDX_SET_VLAN_VID >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_SET_VLAN_VID & 0xff}\n \t},\n \t{\n \t.description = \"vtag_de\",\n@@ -2963,8 +2963,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_ACT_PROP_IDX_SET_VLAN_PCP >> 8) & 0xff,\n-\t\tBNXT_ULP_ACT_PROP_IDX_SET_VLAN_PCP & 0xff}\n+\t(BNXT_ULP_ACT_PROP_IDX_SET_VLAN_PCP >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_SET_VLAN_PCP & 0xff}\n \t},\n \t{\n \t.description = \"spare\",\n@@ -2979,8 +2979,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 & 0xff}\n \t},\n \t{\n \t.description = \"age_enable\",\n@@ -3006,14 +3006,14 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,\n \t.field_opr1 = {\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 56) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 48) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 40) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 32) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 24) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 16) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 8) & 0xff,\n-\t\t(uint64_t)BNXT_ULP_ACT_BIT_COUNT & 0xff}\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 56) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 48) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 40) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 32) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 24) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 16) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 8) & 0xff,\n+\t(uint64_t)BNXT_ULP_ACT_BIT_COUNT & 0xff}\n \t},\n \t{\n \t.description = \"tcpflags_key\",\n@@ -3039,8 +3039,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_ENCAP_PTR_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_ENCAP_PTR_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_ENCAP_PTR_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_ENCAP_PTR_0 & 0xff}\n \t},\n \t{\n \t.description = \"dst_ip_ptr\",\n@@ -3090,8 +3090,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_CF_IDX_ACT_DEC_TTL >> 8) & 0xff,\n-\t\tBNXT_ULP_CF_IDX_ACT_DEC_TTL & 0xff}\n+\t(BNXT_ULP_CF_IDX_ACT_DEC_TTL >> 8) & 0xff,\n+\tBNXT_ULP_CF_IDX_ACT_DEC_TTL & 0xff}\n \t},\n \t{\n \t.description = \"tl3_ttl_dec\",\n@@ -3099,8 +3099,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_CF_IDX_ACT_T_DEC_TTL >> 8) & 0xff,\n-\t\tBNXT_ULP_CF_IDX_ACT_T_DEC_TTL & 0xff}\n+\t(BNXT_ULP_CF_IDX_ACT_T_DEC_TTL >> 8) & 0xff,\n+\tBNXT_ULP_CF_IDX_ACT_T_DEC_TTL & 0xff}\n \t},\n \t{\n \t.description = \"decap_func\",\n@@ -3114,8 +3114,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_ACT_PROP_IDX_VPORT >> 8) & 0xff,\n-\t\tBNXT_ULP_ACT_PROP_IDX_VPORT & 0xff}\n+\t(BNXT_ULP_ACT_PROP_IDX_VPORT >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_VPORT & 0xff}\n \t},\n \t{\n \t.description = \"pop_vlan\",\n@@ -3141,14 +3141,14 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,\n \t.field_opr1 = {\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 56) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 48) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 40) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 32) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 24) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 16) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 8) & 0xff,\n-\t\t(uint64_t)BNXT_ULP_ACT_BIT_DROP & 0xff}\n+\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 56) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 48) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 40) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 32) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 24) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 16) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 8) & 0xff,\n+\t(uint64_t)BNXT_ULP_ACT_BIT_DROP & 0xff}\n \t},\n \t{\n \t.description = \"hit\",\n@@ -3169,8 +3169,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 & 0xff}\n \t},\n \t{\n \t.description = \"age_enable\",\n@@ -3196,14 +3196,14 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,\n \t.field_opr1 = {\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 56) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 48) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 40) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 32) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 24) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 16) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 8) & 0xff,\n-\t\t(uint64_t)BNXT_ULP_ACT_BIT_COUNT & 0xff}\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 56) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 48) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 40) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 32) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 24) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 16) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 8) & 0xff,\n+\t(uint64_t)BNXT_ULP_ACT_BIT_COUNT & 0xff}\n \t},\n \t{\n \t.description = \"flow_cntr_ext\",\n@@ -3289,8 +3289,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_CF_IDX_ACT_DEC_TTL >> 8) & 0xff,\n-\t\tBNXT_ULP_CF_IDX_ACT_DEC_TTL & 0xff}\n+\t(BNXT_ULP_CF_IDX_ACT_DEC_TTL >> 8) & 0xff,\n+\tBNXT_ULP_CF_IDX_ACT_DEC_TTL & 0xff}\n \t},\n \t{\n \t.description = \"tl3_ttl_dec\",\n@@ -3298,8 +3298,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_CF_IDX_ACT_T_DEC_TTL >> 8) & 0xff,\n-\t\tBNXT_ULP_CF_IDX_ACT_T_DEC_TTL & 0xff}\n+\t(BNXT_ULP_CF_IDX_ACT_T_DEC_TTL >> 8) & 0xff,\n+\tBNXT_ULP_CF_IDX_ACT_T_DEC_TTL & 0xff}\n \t},\n \t{\n \t.description = \"decap_func\",\n@@ -3313,8 +3313,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_ACT_PROP_IDX_VPORT >> 8) & 0xff,\n-\t\tBNXT_ULP_ACT_PROP_IDX_VPORT & 0xff}\n+\t(BNXT_ULP_ACT_PROP_IDX_VPORT >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_VPORT & 0xff}\n \t},\n \t{\n \t.description = \"pop_vlan\",\n@@ -3340,14 +3340,14 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,\n \t.field_opr1 = {\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 56) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 48) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 40) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 32) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 24) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 16) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 8) & 0xff,\n-\t\t(uint64_t)BNXT_ULP_ACT_BIT_DROP & 0xff}\n+\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 56) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 48) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 40) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 32) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 24) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 16) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 8) & 0xff,\n+\t(uint64_t)BNXT_ULP_ACT_BIT_DROP & 0xff}\n \t},\n \t{\n \t.description = \"ecv_tun_type\",\n@@ -3373,7 +3373,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\tULP_WP_SYM_ECV_L2_EN_YES}\n+\tULP_WP_SYM_ECV_L2_EN_YES}\n \t},\n \t{\n \t.description = \"ecv_vtag_type\",\n@@ -3430,8 +3430,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 & 0xff}\n \t},\n \t{\n \t.description = \"age_enable\",\n@@ -3457,14 +3457,14 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,\n \t.field_opr1 = {\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 56) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 48) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 40) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 32) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 24) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 16) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 8) & 0xff,\n-\t\t(uint64_t)BNXT_ULP_ACT_BIT_COUNT & 0xff}\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 56) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 48) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 40) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 32) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 24) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 16) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 8) & 0xff,\n+\t(uint64_t)BNXT_ULP_ACT_BIT_COUNT & 0xff}\n \t},\n \t{\n \t.description = \"flow_cntr_ext\",\n@@ -3550,8 +3550,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_CF_IDX_ACT_DEC_TTL >> 8) & 0xff,\n-\t\tBNXT_ULP_CF_IDX_ACT_DEC_TTL & 0xff}\n+\t(BNXT_ULP_CF_IDX_ACT_DEC_TTL >> 8) & 0xff,\n+\tBNXT_ULP_CF_IDX_ACT_DEC_TTL & 0xff}\n \t},\n \t{\n \t.description = \"tl3_ttl_dec\",\n@@ -3559,8 +3559,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_CF_IDX_ACT_T_DEC_TTL >> 8) & 0xff,\n-\t\tBNXT_ULP_CF_IDX_ACT_T_DEC_TTL & 0xff}\n+\t(BNXT_ULP_CF_IDX_ACT_T_DEC_TTL >> 8) & 0xff,\n+\tBNXT_ULP_CF_IDX_ACT_T_DEC_TTL & 0xff}\n \t},\n \t{\n \t.description = \"decap_func\",\n@@ -3574,8 +3574,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_ACT_PROP_IDX_VPORT >> 8) & 0xff,\n-\t\tBNXT_ULP_ACT_PROP_IDX_VPORT & 0xff}\n+\t(BNXT_ULP_ACT_PROP_IDX_VPORT >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_VPORT & 0xff}\n \t},\n \t{\n \t.description = \"pop_vlan\",\n@@ -3583,14 +3583,14 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,\n \t.field_opr1 = {\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 56) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 48) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 40) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 32) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 24) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 16) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 8) & 0xff,\n-\t\t(uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN & 0xff}\n+\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 56) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 48) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 40) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 32) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 24) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 16) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 8) & 0xff,\n+\t(uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN & 0xff}\n \t},\n \t{\n \t.description = \"meter\",\n@@ -3610,14 +3610,14 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,\n \t.field_opr1 = {\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 56) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 48) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 40) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 32) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 24) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 16) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 8) & 0xff,\n-\t\t(uint64_t)BNXT_ULP_ACT_BIT_DROP & 0xff}\n+\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 56) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 48) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 40) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 32) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 24) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 16) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 8) & 0xff,\n+\t(uint64_t)BNXT_ULP_ACT_BIT_DROP & 0xff}\n \t},\n \t{\n \t.description = \"ecv_tun_type\",\n@@ -3649,7 +3649,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\tULP_WP_SYM_ECV_VTAG_TYPE_ADD_1_ENCAP_PRI}\n+\tULP_WP_SYM_ECV_VTAG_TYPE_ADD_1_ENCAP_PRI}\n \t},\n \t{\n \t.description = \"ecv_custom_en\",\n@@ -3663,7 +3663,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"vtag_tpid\",\n@@ -3671,8 +3671,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_ACT_PROP_IDX_PUSH_VLAN >> 8) & 0xff,\n-\t\tBNXT_ULP_ACT_PROP_IDX_PUSH_VLAN & 0xff}\n+\t(BNXT_ULP_ACT_PROP_IDX_PUSH_VLAN >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_PUSH_VLAN & 0xff}\n \t},\n \t{\n \t.description = \"vtag_vid\",\n@@ -3680,8 +3680,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_ACT_PROP_IDX_SET_VLAN_VID >> 8) & 0xff,\n-\t\tBNXT_ULP_ACT_PROP_IDX_SET_VLAN_VID & 0xff}\n+\t(BNXT_ULP_ACT_PROP_IDX_SET_VLAN_VID >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_SET_VLAN_VID & 0xff}\n \t},\n \t{\n \t.description = \"vtag_de\",\n@@ -3695,8 +3695,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_ACT_PROP_IDX_SET_VLAN_PCP >> 8) & 0xff,\n-\t\tBNXT_ULP_ACT_PROP_IDX_SET_VLAN_PCP & 0xff}\n+\t(BNXT_ULP_ACT_PROP_IDX_SET_VLAN_PCP >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_SET_VLAN_PCP & 0xff}\n \t},\n \t{\n \t.description = \"spare\",\n@@ -3718,8 +3718,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_ACT_PROP_IDX_SET_IPV4_SRC >> 8) & 0xff,\n-\t\tBNXT_ULP_ACT_PROP_IDX_SET_IPV4_SRC & 0xff}\n+\t(BNXT_ULP_ACT_PROP_IDX_SET_IPV4_SRC >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_SET_IPV4_SRC & 0xff}\n \t},\n \t/* act_tid: 5, wh_plus, table: act_modify_ipv4_dst.0 */\n \t{\n@@ -3728,8 +3728,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_ACT_PROP_IDX_SET_IPV4_DST >> 8) & 0xff,\n-\t\tBNXT_ULP_ACT_PROP_IDX_SET_IPV4_DST & 0xff}\n+\t(BNXT_ULP_ACT_PROP_IDX_SET_IPV4_DST >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_SET_IPV4_DST & 0xff}\n \t},\n \t/* act_tid: 5, wh_plus, table: int_encap_mac_record.dummy */\n \t{\n@@ -3756,7 +3756,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\tULP_WP_SYM_ECV_L2_EN_YES}\n+\tULP_WP_SYM_ECV_L2_EN_YES}\n \t},\n \t{\n \t.description = \"ecv_vtag_type\",\n@@ -3776,7 +3776,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"vtag_tpid\",\n@@ -3815,8 +3815,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 & 0xff}\n \t},\n \t{\n \t.description = \"age_enable\",\n@@ -3842,14 +3842,14 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,\n \t.field_opr1 = {\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 56) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 48) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 40) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 32) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 24) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 16) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 8) & 0xff,\n-\t\t(uint64_t)BNXT_ULP_ACT_BIT_COUNT & 0xff}\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 56) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 48) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 40) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 32) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 24) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 16) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 8) & 0xff,\n+\t(uint64_t)BNXT_ULP_ACT_BIT_COUNT & 0xff}\n \t},\n \t{\n \t.description = \"tcpflags_key\",\n@@ -3875,8 +3875,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR >> 8) & 0xff,\n-\t\tBNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR & 0xff}\n+\t(BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR >> 8) & 0xff,\n+\tBNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR & 0xff}\n \t},\n \t{\n \t.description = \"dst_ip_ptr\",\n@@ -3884,8 +3884,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 & 0xff}\n \t},\n \t{\n \t.description = \"tcp_dst_port\",\n@@ -3893,14 +3893,14 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,\n \t.field_opr1 = {\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 56) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 48) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 40) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 32) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 24) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 16) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 8) & 0xff,\n-\t\t(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST & 0xff},\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 56) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 48) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 40) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 32) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 24) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 16) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 8) & 0xff,\n+\t(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr2 = {\n \t\t(BNXT_ULP_ACT_PROP_IDX_SET_TP_DST >> 8) & 0xff,\n@@ -3913,8 +3913,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 & 0xff}\n \t},\n \t{\n \t.description = \"tcp_src_port\",\n@@ -3922,14 +3922,14 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,\n \t.field_opr1 = {\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 56) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 48) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 40) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 32) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 24) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 16) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 8) & 0xff,\n-\t\t(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC & 0xff},\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 56) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 48) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 40) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 32) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 24) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 16) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 8) & 0xff,\n+\t(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr2 = {\n \t\t(BNXT_ULP_ACT_PROP_IDX_SET_TP_SRC >> 8) & 0xff,\n@@ -3960,8 +3960,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_CF_IDX_ACT_DEC_TTL >> 8) & 0xff,\n-\t\tBNXT_ULP_CF_IDX_ACT_DEC_TTL & 0xff}\n+\t(BNXT_ULP_CF_IDX_ACT_DEC_TTL >> 8) & 0xff,\n+\tBNXT_ULP_CF_IDX_ACT_DEC_TTL & 0xff}\n \t},\n \t{\n \t.description = \"tl3_ttl_dec\",\n@@ -3969,8 +3969,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_CF_IDX_ACT_T_DEC_TTL >> 8) & 0xff,\n-\t\tBNXT_ULP_CF_IDX_ACT_T_DEC_TTL & 0xff}\n+\t(BNXT_ULP_CF_IDX_ACT_T_DEC_TTL >> 8) & 0xff,\n+\tBNXT_ULP_CF_IDX_ACT_T_DEC_TTL & 0xff}\n \t},\n \t{\n \t.description = \"decap_func\",\n@@ -3978,20 +3978,20 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,\n \t.field_opr1 = {\n-\t\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 56) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 48) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 40) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 32) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 24) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 16) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 8) & 0xff,\n-\t\t(uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN & 0xff},\n+\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 56) & 0xff,\n+\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 48) & 0xff,\n+\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 40) & 0xff,\n+\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 32) & 0xff,\n+\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 24) & 0xff,\n+\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 16) & 0xff,\n+\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 8) & 0xff,\n+\t(uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr2 = {\n \t\tULP_WP_SYM_DECAP_FUNC_THRU_TL2},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr3 = {\n-\t\tULP_WP_SYM_DECAP_FUNC_THRU_L2}\n+\tULP_WP_SYM_DECAP_FUNC_THRU_L2}\n \t},\n \t{\n \t.description = \"vnic_or_vport\",\n@@ -3999,8 +3999,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_ACT_PROP_IDX_VPORT >> 8) & 0xff,\n-\t\tBNXT_ULP_ACT_PROP_IDX_VPORT & 0xff}\n+\t(BNXT_ULP_ACT_PROP_IDX_VPORT >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_VPORT & 0xff}\n \t},\n \t{\n \t.description = \"pop_vlan\",\n@@ -4045,8 +4045,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 & 0xff}\n \t},\n \t{\n \t.description = \"age_enable\",\n@@ -4072,14 +4072,14 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,\n \t.field_opr1 = {\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 56) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 48) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 40) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 32) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 24) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 16) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 8) & 0xff,\n-\t\t(uint64_t)BNXT_ULP_ACT_BIT_COUNT & 0xff}\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 56) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 48) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 40) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 32) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 24) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 16) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 8) & 0xff,\n+\t(uint64_t)BNXT_ULP_ACT_BIT_COUNT & 0xff}\n \t},\n \t{\n \t.description = \"flow_cntr_ext\",\n@@ -4111,8 +4111,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR >> 8) & 0xff,\n-\t\tBNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR & 0xff}\n+\t(BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR >> 8) & 0xff,\n+\tBNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR & 0xff}\n \t},\n \t{\n \t.description = \"encap_rec_int\",\n@@ -4120,7 +4120,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"dst_ip_ptr\",\n@@ -4128,8 +4128,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 & 0xff}\n \t},\n \t{\n \t.description = \"tcp_dst_port\",\n@@ -4137,14 +4137,14 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,\n \t.field_opr1 = {\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 56) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 48) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 40) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 32) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 24) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 16) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 8) & 0xff,\n-\t\t(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST & 0xff},\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 56) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 48) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 40) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 32) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 24) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 16) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 8) & 0xff,\n+\t(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr2 = {\n \t\t(BNXT_ULP_ACT_PROP_IDX_SET_TP_DST >> 8) & 0xff,\n@@ -4157,8 +4157,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 & 0xff}\n \t},\n \t{\n \t.description = \"tcp_src_port\",\n@@ -4166,14 +4166,14 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,\n \t.field_opr1 = {\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 56) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 48) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 40) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 32) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 24) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 16) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 8) & 0xff,\n-\t\t(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC & 0xff},\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 56) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 48) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 40) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 32) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 24) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 16) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 8) & 0xff,\n+\t(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr2 = {\n \t\t(BNXT_ULP_ACT_PROP_IDX_SET_TP_SRC >> 8) & 0xff,\n@@ -4204,8 +4204,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_CF_IDX_ACT_DEC_TTL >> 8) & 0xff,\n-\t\tBNXT_ULP_CF_IDX_ACT_DEC_TTL & 0xff}\n+\t(BNXT_ULP_CF_IDX_ACT_DEC_TTL >> 8) & 0xff,\n+\tBNXT_ULP_CF_IDX_ACT_DEC_TTL & 0xff}\n \t},\n \t{\n \t.description = \"tl3_ttl_dec\",\n@@ -4213,8 +4213,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_CF_IDX_ACT_T_DEC_TTL >> 8) & 0xff,\n-\t\tBNXT_ULP_CF_IDX_ACT_T_DEC_TTL & 0xff}\n+\t(BNXT_ULP_CF_IDX_ACT_T_DEC_TTL >> 8) & 0xff,\n+\tBNXT_ULP_CF_IDX_ACT_T_DEC_TTL & 0xff}\n \t},\n \t{\n \t.description = \"decap_func\",\n@@ -4222,20 +4222,20 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,\n \t.field_opr1 = {\n-\t\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 56) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 48) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 40) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 32) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 24) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 16) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 8) & 0xff,\n-\t\t(uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN & 0xff},\n+\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 56) & 0xff,\n+\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 48) & 0xff,\n+\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 40) & 0xff,\n+\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 32) & 0xff,\n+\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 24) & 0xff,\n+\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 16) & 0xff,\n+\t((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 8) & 0xff,\n+\t(uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr2 = {\n \t\tULP_WP_SYM_DECAP_FUNC_THRU_TL2},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr3 = {\n-\t\tULP_WP_SYM_DECAP_FUNC_THRU_L2}\n+\tULP_WP_SYM_DECAP_FUNC_THRU_L2}\n \t},\n \t{\n \t.description = \"vnic_or_vport\",\n@@ -4243,8 +4243,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_ACT_PROP_IDX_VPORT >> 8) & 0xff,\n-\t\tBNXT_ULP_ACT_PROP_IDX_VPORT & 0xff}\n+\t(BNXT_ULP_ACT_PROP_IDX_VPORT >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_VPORT & 0xff}\n \t},\n \t{\n \t.description = \"pop_vlan\",\n@@ -4294,7 +4294,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\tULP_WP_SYM_ECV_L2_EN_YES}\n+\tULP_WP_SYM_ECV_L2_EN_YES}\n \t},\n \t{\n \t.description = \"ecv_vtag_type\",\n@@ -4358,8 +4358,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_ACT_PROP_IDX_ENCAP_L2_SMAC >> 8) & 0xff,\n-\t\tBNXT_ULP_ACT_PROP_IDX_ENCAP_L2_SMAC & 0xff}\n+\t(BNXT_ULP_ACT_PROP_IDX_ENCAP_L2_SMAC >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_ENCAP_L2_SMAC & 0xff}\n \t},\n \t{\n \t.description = \"ipv4_src_addr\",\n@@ -4367,8 +4367,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_ACT_PROP_IDX_ENCAP_IP_SRC >> 8) & 0xff,\n-\t\tBNXT_ULP_ACT_PROP_IDX_ENCAP_IP_SRC & 0xff}\n+\t(BNXT_ULP_ACT_PROP_IDX_ENCAP_IP_SRC >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_ENCAP_IP_SRC & 0xff}\n \t},\n \t{\n \t.description = \"reserved\",\n@@ -4383,8 +4383,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_ACT_PROP_IDX_ENCAP_L2_SMAC >> 8) & 0xff,\n-\t\tBNXT_ULP_ACT_PROP_IDX_ENCAP_L2_SMAC & 0xff}\n+\t(BNXT_ULP_ACT_PROP_IDX_ENCAP_L2_SMAC >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_ENCAP_L2_SMAC & 0xff}\n \t},\n \t{\n \t.description = \"ipv6_src_addr\",\n@@ -4392,8 +4392,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_ACT_PROP_IDX_ENCAP_IP_SRC >> 8) & 0xff,\n-\t\tBNXT_ULP_ACT_PROP_IDX_ENCAP_IP_SRC & 0xff}\n+\t(BNXT_ULP_ACT_PROP_IDX_ENCAP_IP_SRC >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_ENCAP_IP_SRC & 0xff}\n \t},\n \t{\n \t.description = \"reserved\",\n@@ -4408,7 +4408,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\tULP_WP_SYM_ECV_TUN_TYPE_VXLAN}\n+\tULP_WP_SYM_ECV_TUN_TYPE_VXLAN}\n \t},\n \t{\n \t.description = \"ecv_l4_type\",\n@@ -4416,7 +4416,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\tULP_WP_SYM_ECV_L4_TYPE_UDP_CSUM}\n+\tULP_WP_SYM_ECV_L4_TYPE_UDP_CSUM}\n \t},\n \t{\n \t.description = \"ecv_l3_type\",\n@@ -4424,8 +4424,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_ACT_PROP_IDX_ENCAP_L3_TYPE >> 8) & 0xff,\n-\t\tBNXT_ULP_ACT_PROP_IDX_ENCAP_L3_TYPE & 0xff}\n+\t(BNXT_ULP_ACT_PROP_IDX_ENCAP_L3_TYPE >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_ENCAP_L3_TYPE & 0xff}\n \t},\n \t{\n \t.description = \"ecv_l2_en\",\n@@ -4433,7 +4433,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"ecv_vtag_type\",\n@@ -4441,8 +4441,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_ACT_PROP_IDX_ENCAP_VTAG_TYPE >> 8) & 0xff,\n-\t\tBNXT_ULP_ACT_PROP_IDX_ENCAP_VTAG_TYPE & 0xff}\n+\t(BNXT_ULP_ACT_PROP_IDX_ENCAP_VTAG_TYPE >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_ENCAP_VTAG_TYPE & 0xff}\n \t},\n \t{\n \t.description = \"ecv_custom_en\",\n@@ -4456,7 +4456,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"encap_l2_dmac\",\n@@ -4464,8 +4464,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_ACT_PROP_IDX_ENCAP_L2_DMAC >> 8) & 0xff,\n-\t\tBNXT_ULP_ACT_PROP_IDX_ENCAP_L2_DMAC & 0xff}\n+\t(BNXT_ULP_ACT_PROP_IDX_ENCAP_L2_DMAC >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_ENCAP_L2_DMAC & 0xff}\n \t},\n \t{\n \t.description = \"encap_vtag\",\n@@ -4495,8 +4495,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_ACT_PROP_IDX_ENCAP_UDP >> 8) & 0xff,\n-\t\tBNXT_ULP_ACT_PROP_IDX_ENCAP_UDP & 0xff}\n+\t(BNXT_ULP_ACT_PROP_IDX_ENCAP_UDP >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_ENCAP_UDP & 0xff}\n \t},\n \t{\n \t.description = \"encap_tun\",\n@@ -4516,8 +4516,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 & 0xff}\n \t},\n \t{\n \t.description = \"age_enable\",\n@@ -4543,14 +4543,14 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,\n \t.field_opr1 = {\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 56) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 48) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 40) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 32) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 24) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 16) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 8) & 0xff,\n-\t\t(uint64_t)BNXT_ULP_ACT_BIT_COUNT & 0xff}\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 56) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 48) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 40) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 32) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 24) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 16) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 8) & 0xff,\n+\t(uint64_t)BNXT_ULP_ACT_BIT_COUNT & 0xff}\n \t},\n \t{\n \t.description = \"tcpflags_key\",\n@@ -4576,8 +4576,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_ENCAP_PTR_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_ENCAP_PTR_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_ENCAP_PTR_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_ENCAP_PTR_0 & 0xff}\n \t},\n \t{\n \t.description = \"dst_ip_ptr\",\n@@ -4645,8 +4645,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_ACT_PROP_IDX_VPORT >> 8) & 0xff,\n-\t\tBNXT_ULP_ACT_PROP_IDX_VPORT & 0xff}\n+\t(BNXT_ULP_ACT_PROP_IDX_VPORT >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_VPORT & 0xff}\n \t},\n \t{\n \t.description = \"pop_vlan\",\n@@ -4691,8 +4691,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 & 0xff}\n \t},\n \t{\n \t.description = \"age_enable\",\n@@ -4718,14 +4718,14 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,\n \t.field_opr1 = {\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 56) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 48) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 40) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 32) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 24) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 16) & 0xff,\n-\t\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 8) & 0xff,\n-\t\t(uint64_t)BNXT_ULP_ACT_BIT_COUNT & 0xff}\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 56) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 48) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 40) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 32) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 24) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 16) & 0xff,\n+\t((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 8) & 0xff,\n+\t(uint64_t)BNXT_ULP_ACT_BIT_COUNT & 0xff}\n \t},\n \t{\n \t.description = \"flow_cntr_ext\",\n@@ -4829,8 +4829,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_ACT_PROP_IDX_VPORT >> 8) & 0xff,\n-\t\tBNXT_ULP_ACT_PROP_IDX_VPORT & 0xff}\n+\t(BNXT_ULP_ACT_PROP_IDX_VPORT >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_VPORT & 0xff}\n \t},\n \t{\n \t.description = \"pop_vlan\",\n@@ -4862,7 +4862,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\tULP_WP_SYM_ECV_TUN_TYPE_VXLAN}\n+\tULP_WP_SYM_ECV_TUN_TYPE_VXLAN}\n \t},\n \t{\n \t.description = \"ecv_l4_type\",\n@@ -4870,7 +4870,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\tULP_WP_SYM_ECV_L4_TYPE_UDP_CSUM}\n+\tULP_WP_SYM_ECV_L4_TYPE_UDP_CSUM}\n \t},\n \t{\n \t.description = \"ecv_l3_type\",\n@@ -4878,8 +4878,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_ACT_PROP_IDX_ENCAP_L3_TYPE >> 8) & 0xff,\n-\t\tBNXT_ULP_ACT_PROP_IDX_ENCAP_L3_TYPE & 0xff}\n+\t(BNXT_ULP_ACT_PROP_IDX_ENCAP_L3_TYPE >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_ENCAP_L3_TYPE & 0xff}\n \t},\n \t{\n \t.description = \"ecv_l2_en\",\n@@ -4887,7 +4887,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"ecv_vtag_type\",\n@@ -4895,8 +4895,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_ACT_PROP_IDX_ENCAP_VTAG_TYPE >> 8) & 0xff,\n-\t\tBNXT_ULP_ACT_PROP_IDX_ENCAP_VTAG_TYPE & 0xff}\n+\t(BNXT_ULP_ACT_PROP_IDX_ENCAP_VTAG_TYPE >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_ENCAP_VTAG_TYPE & 0xff}\n \t},\n \t{\n \t.description = \"ecv_custom_en\",\n@@ -4910,7 +4910,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"encap_l2_dmac\",\n@@ -4918,8 +4918,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_ACT_PROP_IDX_ENCAP_L2_DMAC >> 8) & 0xff,\n-\t\tBNXT_ULP_ACT_PROP_IDX_ENCAP_L2_DMAC & 0xff}\n+\t(BNXT_ULP_ACT_PROP_IDX_ENCAP_L2_DMAC >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_ENCAP_L2_DMAC & 0xff}\n \t},\n \t{\n \t.description = \"encap_vtag\",\n@@ -4949,8 +4949,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_ACT_PROP_IDX_ENCAP_UDP >> 8) & 0xff,\n-\t\tBNXT_ULP_ACT_PROP_IDX_ENCAP_UDP & 0xff}\n+\t(BNXT_ULP_ACT_PROP_IDX_ENCAP_UDP >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_ENCAP_UDP & 0xff}\n \t},\n \t{\n \t.description = \"encap_tun\",\n@@ -4958,8 +4958,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_ACT_PROP_IDX_ENCAP_TUN >> 8) & 0xff,\n-\t\tBNXT_ULP_ACT_PROP_IDX_ENCAP_TUN & 0xff}\n+\t(BNXT_ULP_ACT_PROP_IDX_ENCAP_TUN >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_ENCAP_TUN & 0xff}\n \t}\n };\n \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 4e0cd66126..ca385b66f9 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@@ -3,7 +3,7 @@\n * All rights reserved.\n */\n \n-/* date: Mon Mar 15 10:26:20 2021 */\n+/* date: Sun Mar 21 13:04:51 2021 */\n \n #include \"ulp_template_db_enum.h\"\n #include \"ulp_template_db_field.h\"\n@@ -1846,8 +1846,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"svif\",\n@@ -1855,8 +1855,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}\n \t\t}\n \t},\n \t/* class_tid: 1, wh_plus, table: mac_addr_cache.rd */\n@@ -1867,8 +1867,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"svif\",\n@@ -1876,8 +1876,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}\n \t\t}\n \t},\n \t{\n@@ -1885,13 +1885,17 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.description = \"tun_hdr\",\n \t\t.field_bit_size = 1,\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n-\t\t.field_src1 = BNXT_ULP_FIELD_SRC_ZERO\n+\t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n+\t\t.field_opr1 = {\n+\t\tULP_WP_SYM_TUN_HDR_TYPE_NONE}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"tun_hdr\",\n \t\t.field_bit_size = 1,\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n-\t\t.field_src1 = BNXT_ULP_FIELD_SRC_ZERO\n+\t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n+\t\t.field_opr1 = {\n+\t\tULP_WP_SYM_TUN_HDR_TYPE_NONE}\n \t\t}\n \t},\n \t{\n@@ -1909,8 +1913,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_O_ONE_VTAG >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_ONE_VTAG & 0xff}\n+\t\t(BNXT_ULP_CF_IDX_O_ONE_VTAG >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_ONE_VTAG & 0xff}\n \t\t}\n \t},\n \t{\n@@ -1920,14 +1924,14 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,\n \t\t.field_opr1 = {\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 56) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 48) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 40) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 32) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 24) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 16) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 8) & 0xff,\n-\t\t\t(uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN & 0xff},\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 56) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 48) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 40) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 32) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 24) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 16) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 8) & 0xff,\n+\t\t(uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr2 = {\n \t\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n@@ -1940,14 +1944,14 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,\n \t\t.field_opr1 = {\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 56) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 48) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 40) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 32) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 24) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 16) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 8) & 0xff,\n-\t\t\t(uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN & 0xff},\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 56) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 48) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 40) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 32) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 24) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 16) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 8) & 0xff,\n+\t\t(uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr2 = {\n \t\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n@@ -1962,8 +1966,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"mac_addr\",\n@@ -1971,8 +1975,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}\n \t\t}\n \t},\n \t/* class_tid: 1, wh_plus, table: l2_cntxt_tcam.0 */\n@@ -1983,14 +1987,14 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,\n \t\t.field_opr1 = {\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 56) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 48) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 40) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 32) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 24) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 16) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 8) & 0xff,\n-\t\t\t(uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN & 0xff},\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 56) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 48) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 40) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 32) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 24) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 16) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 8) & 0xff,\n+\t\t(uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr2 = {\n \t\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n@@ -2003,14 +2007,14 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,\n \t\t.field_opr1 = {\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 56) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 48) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 40) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 32) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 24) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 16) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 8) & 0xff,\n-\t\t\t(uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN & 0xff},\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 56) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 48) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 40) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 32) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 24) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 16) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 8) & 0xff,\n+\t\t(uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr2 = {\n \t\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n@@ -2039,8 +2043,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"mac0_addr\",\n@@ -2048,8 +2052,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}\n \t\t}\n \t},\n \t{\n@@ -2059,8 +2063,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"svif\",\n@@ -2068,8 +2072,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}\n \t\t}\n \t},\n \t{\n@@ -2143,8 +2147,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_O_VTAG_NUM >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_VTAG_NUM & 0xff}\n+\t\t(BNXT_ULP_CF_IDX_O_VTAG_NUM >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_VTAG_NUM & 0xff}\n \t\t}\n \t},\n \t{\n@@ -2166,13 +2170,17 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.description = \"tun_hdr_type\",\n \t\t.field_bit_size = 4,\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n-\t\t.field_src1 = BNXT_ULP_FIELD_SRC_ZERO\n+\t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n+\t\t.field_opr1 = {\n+\t\tULP_WP_SYM_TUN_HDR_TYPE_NONE}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"tun_hdr_type\",\n \t\t.field_bit_size = 4,\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n-\t\t.field_src1 = BNXT_ULP_FIELD_SRC_ZERO\n+\t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n+\t\t.field_opr1 = {\n+\t\tULP_WP_SYM_TUN_HDR_TYPE_NONE}\n \t\t}\n \t},\n \t{\n@@ -2196,7 +2204,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\t1}\n+\t\t1}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"valid\",\n@@ -2204,7 +2212,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\t1}\n+\t\t1}\n \t\t}\n \t},\n \t/* class_tid: 1, wh_plus, table: mac_addr_cache.wr */\n@@ -2215,8 +2223,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"svif\",\n@@ -2224,8 +2232,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}\n \t\t}\n \t},\n \t{\n@@ -2233,13 +2241,17 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.description = \"tun_hdr\",\n \t\t.field_bit_size = 1,\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n-\t\t.field_src1 = BNXT_ULP_FIELD_SRC_ZERO\n+\t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n+\t\t.field_opr1 = {\n+\t\tULP_WP_SYM_TUN_HDR_TYPE_NONE}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"tun_hdr\",\n \t\t.field_bit_size = 1,\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n-\t\t.field_src1 = BNXT_ULP_FIELD_SRC_ZERO\n+\t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n+\t\t.field_opr1 = {\n+\t\tULP_WP_SYM_TUN_HDR_TYPE_NONE}\n \t\t}\n \t},\n \t{\n@@ -2257,8 +2269,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_O_ONE_VTAG >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_ONE_VTAG & 0xff}\n+\t\t(BNXT_ULP_CF_IDX_O_ONE_VTAG >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_ONE_VTAG & 0xff}\n \t\t}\n \t},\n \t{\n@@ -2268,14 +2280,14 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,\n \t\t.field_opr1 = {\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 56) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 48) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 40) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 32) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 24) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 16) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 8) & 0xff,\n-\t\t\t(uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN & 0xff},\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 56) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 48) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 40) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 32) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 24) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 16) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 8) & 0xff,\n+\t\t(uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr2 = {\n \t\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n@@ -2288,14 +2300,14 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,\n \t\t.field_opr1 = {\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 56) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 48) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 40) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 32) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 24) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 16) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 8) & 0xff,\n-\t\t\t(uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN & 0xff},\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 56) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 48) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 40) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 32) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 24) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 16) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 8) & 0xff,\n+\t\t(uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr2 = {\n \t\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n@@ -2310,8 +2322,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"mac_addr\",\n@@ -2319,8 +2331,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}\n \t\t}\n \t},\n \t/* class_tid: 1, wh_plus, table: profile_tcam_cache.rd */\n@@ -2355,16 +2367,16 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t\t.field_opr2 = {\n \t\t\t(BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID >> 8) & 0xff,\n \t\t\tBNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t\t.field_opr3 = {\n-\t\t\t(BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID & 0xff}\n+\t\t(BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID & 0xff}\n \t\t}\n \t},\n \t{\n@@ -2382,8 +2394,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_HDR_SIG_ID >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_HDR_SIG_ID & 0xff}\n+\t\t(BNXT_ULP_CF_IDX_HDR_SIG_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_HDR_SIG_ID & 0xff}\n \t\t}\n \t},\n \t/* class_tid: 1, wh_plus, table: profile_tcam.ipv4 */\n@@ -2408,8 +2420,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_ONES,\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n@@ -2419,20 +2431,20 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,\n \t\t.field_opr1 = {\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,\n-\t\t\t(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,\n+\t\t(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr2 = {\n \t\t\tULP_WP_SYM_L4_HDR_TYPE_TCP},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr3 = {\n-\t\t\tULP_WP_SYM_L4_HDR_TYPE_UDP}\n+\t\tULP_WP_SYM_L4_HDR_TYPE_UDP}\n \t\t}\n \t},\n \t{\n@@ -2442,8 +2454,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff}\n+\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"l4_hdr_error\",\n@@ -2459,8 +2471,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff}\n+\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"l4_hdr_valid\",\n@@ -2468,8 +2480,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff}\n+\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff}\n \t\t}\n \t},\n \t{\n@@ -2561,7 +2573,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\tULP_WP_SYM_L3_HDR_VALID_YES}\n+\t\tULP_WP_SYM_L3_HDR_VALID_YES}\n \t\t}\n \t},\n \t{\n@@ -2595,8 +2607,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_O_ONE_VTAG >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_ONE_VTAG & 0xff}\n+\t\t(BNXT_ULP_CF_IDX_O_ONE_VTAG >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_ONE_VTAG & 0xff}\n \t\t}\n \t},\n \t{\n@@ -2662,7 +2674,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\tULP_WP_SYM_L2_HDR_VALID_YES}\n+\t\tULP_WP_SYM_L2_HDR_VALID_YES}\n \t\t}\n \t},\n \t{\n@@ -2982,16 +2994,16 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t\t.field_opr2 = {\n \t\t\t(BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID >> 8) & 0xff,\n \t\t\tBNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t\t.field_opr3 = {\n-\t\t\t(BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID & 0xff}\n+\t\t(BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID & 0xff}\n \t\t}\n \t},\n \t{\n@@ -3057,7 +3069,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\t1}\n+\t\t1}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"valid\",\n@@ -3065,7 +3077,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\t1}\n+\t\t1}\n \t\t}\n \t},\n \t/* class_tid: 1, wh_plus, table: profile_tcam.ipv6 */\n@@ -3090,8 +3102,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_ONES,\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n@@ -3101,20 +3113,20 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,\n \t\t.field_opr1 = {\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,\n-\t\t\t(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,\n+\t\t(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr2 = {\n \t\t\tULP_WP_SYM_L4_HDR_TYPE_TCP},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr3 = {\n-\t\t\tULP_WP_SYM_L4_HDR_TYPE_UDP}\n+\t\tULP_WP_SYM_L4_HDR_TYPE_UDP}\n \t\t}\n \t},\n \t{\n@@ -3124,8 +3136,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff}\n+\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"l4_hdr_error\",\n@@ -3141,8 +3153,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff}\n+\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"l4_hdr_valid\",\n@@ -3150,8 +3162,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff}\n+\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff}\n \t\t}\n \t},\n \t{\n@@ -3211,7 +3223,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\tULP_WP_SYM_L3_HDR_TYPE_IPV6}\n+\t\tULP_WP_SYM_L3_HDR_TYPE_IPV6}\n \t\t}\n \t},\n \t{\n@@ -3245,7 +3257,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\tULP_WP_SYM_L3_HDR_VALID_YES}\n+\t\tULP_WP_SYM_L3_HDR_VALID_YES}\n \t\t}\n \t},\n \t{\n@@ -3279,8 +3291,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_O_ONE_VTAG >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_ONE_VTAG & 0xff}\n+\t\t(BNXT_ULP_CF_IDX_O_ONE_VTAG >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_ONE_VTAG & 0xff}\n \t\t}\n \t},\n \t{\n@@ -3346,7 +3358,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\tULP_WP_SYM_L2_HDR_VALID_YES}\n+\t\tULP_WP_SYM_L2_HDR_VALID_YES}\n \t\t}\n \t},\n \t{\n@@ -3666,16 +3678,16 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t\t.field_opr2 = {\n \t\t\t(BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID >> 8) & 0xff,\n \t\t\tBNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t\t.field_opr3 = {\n-\t\t\t(BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID & 0xff}\n+\t\t(BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID & 0xff}\n \t\t}\n \t},\n \t{\n@@ -3741,7 +3753,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\t1}\n+\t\t1}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"valid\",\n@@ -3749,7 +3761,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\t1}\n+\t\t1}\n \t\t}\n \t},\n \t/* class_tid: 1, wh_plus, table: profile_tcam.ipv4_vxlan */\n@@ -3782,7 +3794,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\tULP_WP_SYM_L4_HDR_TYPE_UDP}\n+\t\tULP_WP_SYM_L4_HDR_TYPE_UDP}\n \t\t}\n \t},\n \t{\n@@ -4044,7 +4056,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\tULP_WP_SYM_TUN_HDR_VALID_YES}\n+\t\tULP_WP_SYM_TUN_HDR_VALID_YES}\n \t\t}\n \t},\n \t{\n@@ -4104,7 +4116,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\tULP_WP_SYM_TL4_HDR_VALID_YES}\n+\t\tULP_WP_SYM_TL4_HDR_VALID_YES}\n \t\t}\n \t},\n \t{\n@@ -4194,7 +4206,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\tULP_WP_SYM_TL3_HDR_VALID_YES}\n+\t\tULP_WP_SYM_TL3_HDR_VALID_YES}\n \t\t}\n \t},\n \t{\n@@ -4270,7 +4282,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\tULP_WP_SYM_TL2_HDR_VALID_YES}\n+\t\tULP_WP_SYM_TL2_HDR_VALID_YES}\n \t\t}\n \t},\n \t{\n@@ -4316,8 +4328,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID & 0xff}\n+\t\t(BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID & 0xff}\n \t\t}\n \t},\n \t{\n@@ -4383,7 +4395,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\t1}\n+\t\t1}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"valid\",\n@@ -4391,7 +4403,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\t1}\n+\t\t1}\n \t\t}\n \t},\n \t/* class_tid: 1, wh_plus, table: profile_tcam_cache.wr */\n@@ -4426,16 +4438,16 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t\t.field_opr2 = {\n \t\t\t(BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID >> 8) & 0xff,\n \t\t\tBNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t\t.field_opr3 = {\n-\t\t\t(BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID & 0xff}\n+\t\t(BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID & 0xff}\n \t\t}\n \t},\n \t{\n@@ -4453,8 +4465,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_HDR_SIG_ID >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_HDR_SIG_ID & 0xff}\n+\t\t(BNXT_ULP_CF_IDX_HDR_SIG_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_HDR_SIG_ID & 0xff}\n \t\t}\n \t},\n \t/* class_tid: 1, wh_plus, table: em.ipv4 */\n@@ -4502,8 +4514,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr2 = {\n \t\t\t(BNXT_ULP_CF_IDX_O_L4_DST_PORT >> 8) & 0xff,\n@@ -4527,8 +4539,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr2 = {\n \t\t\t(BNXT_ULP_CF_IDX_O_L4_SRC_PORT >> 8) & 0xff,\n@@ -4551,8 +4563,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_PROTO_ID >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_PROTO_ID & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_PROTO_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_PROTO_ID & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr2 = {\n \t\t\t(BNXT_ULP_CF_IDX_O_L3_PROTO_ID >> 8) & 0xff,\n@@ -4567,8 +4579,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"l3.dst\",\n@@ -4576,8 +4588,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}\n \t\t}\n \t},\n \t{\n@@ -4587,8 +4599,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"l3.src\",\n@@ -4596,8 +4608,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff}\n \t\t}\n \t},\n \t{\n@@ -4607,8 +4619,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"l2.smac\",\n@@ -4616,8 +4628,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff}\n \t\t}\n \t},\n \t{\n@@ -4636,8 +4648,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}\n+\t\t(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}\n \t\t}\n \t},\n \t{\n@@ -4655,8 +4667,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}\n+\t\t(BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}\n \t\t}\n \t},\n \t/* class_tid: 1, wh_plus, table: eem.ipv4 */\n@@ -4704,8 +4716,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr2 = {\n \t\t\t(BNXT_ULP_CF_IDX_O_L4_DST_PORT >> 8) & 0xff,\n@@ -4729,8 +4741,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr2 = {\n \t\t\t(BNXT_ULP_CF_IDX_O_L4_SRC_PORT >> 8) & 0xff,\n@@ -4753,8 +4765,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_PROTO_ID >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_PROTO_ID & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_PROTO_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_PROTO_ID & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr2 = {\n \t\t\t(BNXT_ULP_CF_IDX_O_L3_PROTO_ID >> 8) & 0xff,\n@@ -4769,8 +4781,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"l3.dst\",\n@@ -4778,8 +4790,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}\n \t\t}\n \t},\n \t{\n@@ -4789,8 +4801,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"l3.src\",\n@@ -4798,8 +4810,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff}\n \t\t}\n \t},\n \t{\n@@ -4809,8 +4821,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"l2.smac\",\n@@ -4818,8 +4830,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff}\n \t\t}\n \t},\n \t{\n@@ -4838,8 +4850,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}\n+\t\t(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}\n \t\t}\n \t},\n \t{\n@@ -4857,8 +4869,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}\n+\t\t(BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}\n \t\t}\n \t},\n \t/* class_tid: 1, wh_plus, table: em.ipv6 */\n@@ -4906,8 +4918,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr2 = {\n \t\t\t(BNXT_ULP_CF_IDX_O_L4_DST_PORT >> 8) & 0xff,\n@@ -4931,8 +4943,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr2 = {\n \t\t\t(BNXT_ULP_CF_IDX_O_L4_SRC_PORT >> 8) & 0xff,\n@@ -4955,8 +4967,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_IPV6_PROTO_ID >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_IPV6_PROTO_ID & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_O_IPV6_PROTO_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_IPV6_PROTO_ID & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr2 = {\n \t\t\t(BNXT_ULP_CF_IDX_O_L3_PROTO_ID >> 8) & 0xff,\n@@ -4971,8 +4983,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"l3.dst\",\n@@ -4980,8 +4992,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 0xff}\n \t\t}\n \t},\n \t{\n@@ -4991,8 +5003,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"l3.src\",\n@@ -5000,8 +5012,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 0xff}\n \t\t}\n \t},\n \t{\n@@ -5011,8 +5023,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"l2.smac\",\n@@ -5020,8 +5032,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff}\n \t\t}\n \t},\n \t{\n@@ -5054,8 +5066,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}\n+\t\t(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}\n \t\t}\n \t},\n \t{\n@@ -5073,8 +5085,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}\n+\t\t(BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}\n \t\t}\n \t},\n \t/* class_tid: 1, wh_plus, table: eem.ipv6 */\n@@ -5122,8 +5134,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr2 = {\n \t\t\t(BNXT_ULP_CF_IDX_O_L4_DST_PORT >> 8) & 0xff,\n@@ -5147,8 +5159,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr2 = {\n \t\t\t(BNXT_ULP_CF_IDX_O_L4_SRC_PORT >> 8) & 0xff,\n@@ -5171,8 +5183,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_IPV6_PROTO_ID >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_IPV6_PROTO_ID & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_O_IPV6_PROTO_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_IPV6_PROTO_ID & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr2 = {\n \t\t\t(BNXT_ULP_CF_IDX_O_L3_PROTO_ID >> 8) & 0xff,\n@@ -5187,8 +5199,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"l3.dst\",\n@@ -5196,8 +5208,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 0xff}\n \t\t}\n \t},\n \t{\n@@ -5207,8 +5219,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"l3.src\",\n@@ -5216,8 +5228,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 0xff}\n \t\t}\n \t},\n \t{\n@@ -5227,8 +5239,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"l2.smac\",\n@@ -5236,8 +5248,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff}\n \t\t}\n \t},\n \t{\n@@ -5270,8 +5282,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}\n+\t\t(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}\n \t\t}\n \t},\n \t{\n@@ -5289,8 +5301,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}\n+\t\t(BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}\n \t\t}\n \t},\n \t/* class_tid: 1, wh_plus, table: em.vxlan */\n@@ -5352,8 +5364,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\t(4789 >> 8) & 0xff,\n-\t\t\t4789 & 0xff}\n+\t\t(4789 >> 8) & 0xff,\n+\t\t4789 & 0xff}\n \t\t}\n \t},\n \t{\n@@ -5371,7 +5383,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\t17}\n+\t\t17}\n \t\t}\n \t},\n \t{\n@@ -5381,8 +5393,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"tl3.dst\",\n@@ -5390,8 +5402,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}\n \t\t}\n \t},\n \t{\n@@ -5452,8 +5464,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}\n+\t\t(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}\n \t\t}\n \t},\n \t{\n@@ -5471,8 +5483,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}\n+\t\t(BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}\n \t\t}\n \t},\n \t/* class_tid: 1, wh_plus, table: eem.vxlan */\n@@ -5520,8 +5532,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\t(4789 >> 8) & 0xff,\n-\t\t\t4789 & 0xff}\n+\t\t(4789 >> 8) & 0xff,\n+\t\t4789 & 0xff}\n \t\t}\n \t},\n \t{\n@@ -5553,7 +5565,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\t17}\n+\t\t17}\n \t\t}\n \t},\n \t{\n@@ -5563,8 +5575,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"tl3.dst\",\n@@ -5572,8 +5584,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}\n \t\t}\n \t},\n \t{\n@@ -5634,8 +5646,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}\n+\t\t(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}\n \t\t}\n \t},\n \t{\n@@ -5653,8 +5665,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}\n+\t\t(BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}\n \t\t}\n \t},\n \t/* class_tid: 2, wh_plus, table: l2_cntxt_tcam_cache.rd */\n@@ -5665,8 +5677,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"svif\",\n@@ -5674,8 +5686,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}\n \t\t}\n \t},\n \t/* class_tid: 2, wh_plus, table: mac_addr_cache.rd */\n@@ -5686,8 +5698,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"svif\",\n@@ -5695,8 +5707,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}\n \t\t}\n \t},\n \t{\n@@ -5704,13 +5716,17 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.description = \"tun_hdr\",\n \t\t.field_bit_size = 1,\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n-\t\t.field_src1 = BNXT_ULP_FIELD_SRC_ZERO\n+\t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n+\t\t.field_opr1 = {\n+\t\tULP_WP_SYM_TUN_HDR_TYPE_NONE}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"tun_hdr\",\n \t\t.field_bit_size = 1,\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n-\t\t.field_src1 = BNXT_ULP_FIELD_SRC_ZERO\n+\t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n+\t\t.field_opr1 = {\n+\t\tULP_WP_SYM_TUN_HDR_TYPE_NONE}\n \t\t}\n \t},\n \t{\n@@ -5728,8 +5744,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_O_ONE_VTAG >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_ONE_VTAG & 0xff}\n+\t\t(BNXT_ULP_CF_IDX_O_ONE_VTAG >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_ONE_VTAG & 0xff}\n \t\t}\n \t},\n \t{\n@@ -5739,14 +5755,14 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,\n \t\t.field_opr1 = {\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 56) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 48) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 40) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 32) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 24) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 16) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 8) & 0xff,\n-\t\t\t(uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN & 0xff},\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 56) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 48) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 40) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 32) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 24) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 16) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 8) & 0xff,\n+\t\t(uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr2 = {\n \t\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n@@ -5759,14 +5775,14 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,\n \t\t.field_opr1 = {\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 56) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 48) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 40) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 32) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 24) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 16) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 8) & 0xff,\n-\t\t\t(uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN & 0xff},\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 56) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 48) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 40) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 32) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 24) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 16) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 8) & 0xff,\n+\t\t(uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr2 = {\n \t\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n@@ -5781,8 +5797,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"mac_addr\",\n@@ -5790,8 +5806,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff}\n \t\t}\n \t},\n \t/* class_tid: 2, wh_plus, table: l2_cntxt_tcam.0 */\n@@ -5802,14 +5818,14 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,\n \t\t.field_opr1 = {\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 56) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 48) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 40) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 32) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 24) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 16) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 8) & 0xff,\n-\t\t\t(uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN & 0xff},\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 56) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 48) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 40) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 32) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 24) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 16) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 8) & 0xff,\n+\t\t(uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr2 = {\n \t\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n@@ -5822,14 +5838,14 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,\n \t\t.field_opr1 = {\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 56) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 48) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 40) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 32) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 24) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 16) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 8) & 0xff,\n-\t\t\t(uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN & 0xff},\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 56) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 48) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 40) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 32) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 24) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 16) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 8) & 0xff,\n+\t\t(uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr2 = {\n \t\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n@@ -5858,8 +5874,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"mac0_addr\",\n@@ -5867,8 +5883,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff}\n \t\t}\n \t},\n \t{\n@@ -5878,8 +5894,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"svif\",\n@@ -5887,8 +5903,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}\n \t\t}\n \t},\n \t{\n@@ -5962,8 +5978,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_O_VTAG_NUM >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_VTAG_NUM & 0xff}\n+\t\t(BNXT_ULP_CF_IDX_O_VTAG_NUM >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_VTAG_NUM & 0xff}\n \t\t}\n \t},\n \t{\n@@ -5985,13 +6001,17 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.description = \"tun_hdr_type\",\n \t\t.field_bit_size = 4,\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n-\t\t.field_src1 = BNXT_ULP_FIELD_SRC_ZERO\n+\t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n+\t\t.field_opr1 = {\n+\t\tULP_WP_SYM_TUN_HDR_TYPE_NONE}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"tun_hdr_type\",\n \t\t.field_bit_size = 4,\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n-\t\t.field_src1 = BNXT_ULP_FIELD_SRC_ZERO\n+\t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n+\t\t.field_opr1 = {\n+\t\tULP_WP_SYM_TUN_HDR_TYPE_NONE}\n \t\t}\n \t},\n \t{\n@@ -6015,7 +6035,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\t1}\n+\t\t1}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"valid\",\n@@ -6023,7 +6043,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\t1}\n+\t\t1}\n \t\t}\n \t},\n \t/* class_tid: 2, wh_plus, table: mac_addr_cache.wr */\n@@ -6034,8 +6054,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"svif\",\n@@ -6043,8 +6063,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}\n \t\t}\n \t},\n \t{\n@@ -6052,13 +6072,17 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.description = \"tun_hdr\",\n \t\t.field_bit_size = 1,\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n-\t\t.field_src1 = BNXT_ULP_FIELD_SRC_ZERO\n+\t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n+\t\t.field_opr1 = {\n+\t\tULP_WP_SYM_TUN_HDR_TYPE_NONE}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"tun_hdr\",\n \t\t.field_bit_size = 1,\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n-\t\t.field_src1 = BNXT_ULP_FIELD_SRC_ZERO\n+\t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n+\t\t.field_opr1 = {\n+\t\tULP_WP_SYM_TUN_HDR_TYPE_NONE}\n \t\t}\n \t},\n \t{\n@@ -6076,8 +6100,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_O_ONE_VTAG >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_ONE_VTAG & 0xff}\n+\t\t(BNXT_ULP_CF_IDX_O_ONE_VTAG >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_ONE_VTAG & 0xff}\n \t\t}\n \t},\n \t{\n@@ -6087,14 +6111,14 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,\n \t\t.field_opr1 = {\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 56) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 48) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 40) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 32) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 24) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 16) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 8) & 0xff,\n-\t\t\t(uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN & 0xff},\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 56) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 48) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 40) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 32) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 24) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 16) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 8) & 0xff,\n+\t\t(uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr2 = {\n \t\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n@@ -6107,14 +6131,14 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,\n \t\t.field_opr1 = {\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 56) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 48) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 40) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 32) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 24) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 16) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 8) & 0xff,\n-\t\t\t(uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN & 0xff},\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 56) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 48) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 40) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 32) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 24) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 16) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 8) & 0xff,\n+\t\t(uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr2 = {\n \t\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n@@ -6129,8 +6153,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"mac_addr\",\n@@ -6138,8 +6162,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff}\n \t\t}\n \t},\n \t/* class_tid: 2, wh_plus, table: profile_tcam_cache.rd */\n@@ -6174,16 +6198,16 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t\t.field_opr2 = {\n \t\t\t(BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID >> 8) & 0xff,\n \t\t\tBNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t\t.field_opr3 = {\n-\t\t\t(BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID & 0xff}\n+\t\t(BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID & 0xff}\n \t\t}\n \t},\n \t{\n@@ -6201,8 +6225,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_HDR_SIG_ID >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_HDR_SIG_ID & 0xff}\n+\t\t(BNXT_ULP_CF_IDX_HDR_SIG_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_HDR_SIG_ID & 0xff}\n \t\t}\n \t},\n \t/* class_tid: 2, wh_plus, table: profile_tcam.ipv4 */\n@@ -6227,8 +6251,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_ONES,\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n@@ -6238,20 +6262,20 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,\n \t\t.field_opr1 = {\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,\n-\t\t\t(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,\n+\t\t(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr2 = {\n \t\t\tULP_WP_SYM_L4_HDR_TYPE_TCP},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr3 = {\n-\t\t\tULP_WP_SYM_L4_HDR_TYPE_UDP}\n+\t\tULP_WP_SYM_L4_HDR_TYPE_UDP}\n \t\t}\n \t},\n \t{\n@@ -6261,8 +6285,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff}\n+\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"l4_hdr_error\",\n@@ -6278,8 +6302,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff}\n+\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"l4_hdr_valid\",\n@@ -6287,8 +6311,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff}\n+\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff}\n \t\t}\n \t},\n \t{\n@@ -6380,7 +6404,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\tULP_WP_SYM_L3_HDR_VALID_YES}\n+\t\tULP_WP_SYM_L3_HDR_VALID_YES}\n \t\t}\n \t},\n \t{\n@@ -6414,8 +6438,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_O_ONE_VTAG >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_ONE_VTAG & 0xff}\n+\t\t(BNXT_ULP_CF_IDX_O_ONE_VTAG >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_ONE_VTAG & 0xff}\n \t\t}\n \t},\n \t{\n@@ -6481,7 +6505,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\tULP_WP_SYM_L2_HDR_VALID_YES}\n+\t\tULP_WP_SYM_L2_HDR_VALID_YES}\n \t\t}\n \t},\n \t{\n@@ -6801,16 +6825,16 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t\t.field_opr2 = {\n \t\t\t(BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID >> 8) & 0xff,\n \t\t\tBNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t\t.field_opr3 = {\n-\t\t\t(BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID & 0xff}\n+\t\t(BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID & 0xff}\n \t\t}\n \t},\n \t{\n@@ -6876,7 +6900,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\t1}\n+\t\t1}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"valid\",\n@@ -6884,7 +6908,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\t1}\n+\t\t1}\n \t\t}\n \t},\n \t/* class_tid: 2, wh_plus, table: profile_tcam.ipv6 */\n@@ -6909,8 +6933,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_ONES,\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n@@ -6920,20 +6944,20 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,\n \t\t.field_opr1 = {\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,\n-\t\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,\n-\t\t\t(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 56) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 48) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 40) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 32) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 24) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 16) & 0xff,\n+\t\t((uint64_t)BNXT_ULP_HDR_BIT_O_TCP >> 8) & 0xff,\n+\t\t(uint64_t)BNXT_ULP_HDR_BIT_O_TCP & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr2 = {\n \t\t\tULP_WP_SYM_L4_HDR_TYPE_TCP},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr3 = {\n-\t\t\tULP_WP_SYM_L4_HDR_TYPE_UDP}\n+\t\tULP_WP_SYM_L4_HDR_TYPE_UDP}\n \t\t}\n \t},\n \t{\n@@ -6943,8 +6967,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff}\n+\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"l4_hdr_error\",\n@@ -6960,8 +6984,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff}\n+\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"l4_hdr_valid\",\n@@ -6969,8 +6993,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff}\n+\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff}\n \t\t}\n \t},\n \t{\n@@ -7030,7 +7054,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\tULP_WP_SYM_L3_HDR_TYPE_IPV6}\n+\t\tULP_WP_SYM_L3_HDR_TYPE_IPV6}\n \t\t}\n \t},\n \t{\n@@ -7064,7 +7088,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\tULP_WP_SYM_L3_HDR_VALID_YES}\n+\t\tULP_WP_SYM_L3_HDR_VALID_YES}\n \t\t}\n \t},\n \t{\n@@ -7098,8 +7122,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_O_ONE_VTAG >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_ONE_VTAG & 0xff}\n+\t\t(BNXT_ULP_CF_IDX_O_ONE_VTAG >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_ONE_VTAG & 0xff}\n \t\t}\n \t},\n \t{\n@@ -7165,7 +7189,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\tULP_WP_SYM_L2_HDR_VALID_YES}\n+\t\tULP_WP_SYM_L2_HDR_VALID_YES}\n \t\t}\n \t},\n \t{\n@@ -7485,16 +7509,16 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t\t.field_opr2 = {\n \t\t\t(BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID >> 8) & 0xff,\n \t\t\tBNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t\t.field_opr3 = {\n-\t\t\t(BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID & 0xff}\n+\t\t(BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID & 0xff}\n \t\t}\n \t},\n \t{\n@@ -7560,7 +7584,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\t1}\n+\t\t1}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"valid\",\n@@ -7568,7 +7592,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\t1}\n+\t\t1}\n \t\t}\n \t},\n \t/* class_tid: 2, wh_plus, table: profile_tcam_cache.wr */\n@@ -7603,16 +7627,16 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t\t.field_opr2 = {\n \t\t\t(BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID >> 8) & 0xff,\n \t\t\tBNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t\t.field_opr3 = {\n-\t\t\t(BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID & 0xff}\n+\t\t(BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID & 0xff}\n \t\t}\n \t},\n \t{\n@@ -7630,8 +7654,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_HDR_SIG_ID >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_HDR_SIG_ID & 0xff}\n+\t\t(BNXT_ULP_CF_IDX_HDR_SIG_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_HDR_SIG_ID & 0xff}\n \t\t}\n \t},\n \t/* class_tid: 2, wh_plus, table: em.ipv4 */\n@@ -7679,8 +7703,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr2 = {\n \t\t\t(BNXT_ULP_CF_IDX_O_L4_DST_PORT >> 8) & 0xff,\n@@ -7704,8 +7728,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr2 = {\n \t\t\t(BNXT_ULP_CF_IDX_O_L4_SRC_PORT >> 8) & 0xff,\n@@ -7728,8 +7752,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_PROTO_ID >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_PROTO_ID & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_PROTO_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_PROTO_ID & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr2 = {\n \t\t\t(BNXT_ULP_CF_IDX_O_L3_PROTO_ID >> 8) & 0xff,\n@@ -7744,8 +7768,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"l3.dst\",\n@@ -7753,8 +7777,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}\n \t\t}\n \t},\n \t{\n@@ -7764,8 +7788,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"l3.src\",\n@@ -7773,8 +7797,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff}\n \t\t}\n \t},\n \t{\n@@ -7784,8 +7808,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"l2.dmac\",\n@@ -7793,8 +7817,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}\n \t\t}\n \t},\n \t{\n@@ -7813,8 +7837,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}\n+\t\t(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}\n \t\t}\n \t},\n \t{\n@@ -7832,8 +7856,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}\n+\t\t(BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}\n \t\t}\n \t},\n \t/* class_tid: 2, wh_plus, table: eem.ipv4 */\n@@ -7881,8 +7905,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr2 = {\n \t\t\t(BNXT_ULP_CF_IDX_O_L4_DST_PORT >> 8) & 0xff,\n@@ -7906,8 +7930,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr2 = {\n \t\t\t(BNXT_ULP_CF_IDX_O_L4_SRC_PORT >> 8) & 0xff,\n@@ -7930,8 +7954,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_PROTO_ID >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_PROTO_ID & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_PROTO_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_PROTO_ID & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr2 = {\n \t\t\t(BNXT_ULP_CF_IDX_O_L3_PROTO_ID >> 8) & 0xff,\n@@ -7946,8 +7970,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"l3.dst\",\n@@ -7955,8 +7979,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}\n \t\t}\n \t},\n \t{\n@@ -7966,8 +7990,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"l3.src\",\n@@ -7975,8 +7999,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff}\n \t\t}\n \t},\n \t{\n@@ -7986,8 +8010,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"l2.dmac\",\n@@ -7995,8 +8019,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}\n \t\t}\n \t},\n \t{\n@@ -8015,8 +8039,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}\n+\t\t(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}\n \t\t}\n \t},\n \t{\n@@ -8034,8 +8058,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}\n+\t\t(BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}\n \t\t}\n \t},\n \t/* class_tid: 2, wh_plus, table: em.ipv6 */\n@@ -8083,8 +8107,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr2 = {\n \t\t\t(BNXT_ULP_CF_IDX_O_L4_DST_PORT >> 8) & 0xff,\n@@ -8108,8 +8132,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr2 = {\n \t\t\t(BNXT_ULP_CF_IDX_O_L4_SRC_PORT >> 8) & 0xff,\n@@ -8132,8 +8156,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_IPV6_PROTO_ID >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_IPV6_PROTO_ID & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_O_IPV6_PROTO_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_IPV6_PROTO_ID & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr2 = {\n \t\t\t(BNXT_ULP_CF_IDX_O_L3_PROTO_ID >> 8) & 0xff,\n@@ -8148,8 +8172,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"l3.dst\",\n@@ -8157,8 +8181,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 0xff}\n \t\t}\n \t},\n \t{\n@@ -8168,8 +8192,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"l3.src\",\n@@ -8177,8 +8201,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 0xff}\n \t\t}\n \t},\n \t{\n@@ -8202,8 +8226,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"l2.dmac\",\n@@ -8211,8 +8235,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}\n \t\t}\n \t},\n \t{\n@@ -8231,8 +8255,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}\n+\t\t(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}\n \t\t}\n \t},\n \t{\n@@ -8250,8 +8274,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}\n+\t\t(BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}\n \t\t}\n \t},\n \t/* class_tid: 2, wh_plus, table: eem.ipv6 */\n@@ -8299,8 +8323,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr2 = {\n \t\t\t(BNXT_ULP_CF_IDX_O_L4_DST_PORT >> 8) & 0xff,\n@@ -8324,8 +8348,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr2 = {\n \t\t\t(BNXT_ULP_CF_IDX_O_L4_SRC_PORT >> 8) & 0xff,\n@@ -8348,8 +8372,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_IPV6_PROTO_ID >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_IPV6_PROTO_ID & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_O_IPV6_PROTO_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_IPV6_PROTO_ID & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr2 = {\n \t\t\t(BNXT_ULP_CF_IDX_O_L3_PROTO_ID >> 8) & 0xff,\n@@ -8364,8 +8388,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"l3.dst\",\n@@ -8373,8 +8397,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 0xff}\n \t\t}\n \t},\n \t{\n@@ -8384,8 +8408,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"l3.src\",\n@@ -8393,8 +8417,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 0xff}\n \t\t}\n \t},\n \t{\n@@ -8418,8 +8442,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"l2.dmac\",\n@@ -8427,8 +8451,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_HF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}\n+\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}\n \t\t}\n \t},\n \t{\n@@ -8447,8 +8471,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}\n+\t\t(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}\n \t\t}\n \t},\n \t{\n@@ -8466,8 +8490,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 >> 8) & 0xff,\n-\t\t\tBNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}\n+\t\t(BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 >> 8) & 0xff,\n+\t\tBNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}\n \t\t}\n \t},\n \t/* class_tid: 3, wh_plus, table: l2_cntxt_tcam_cache.ing_rd */\n@@ -8486,8 +8510,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_PHY_PORT_SVIF >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_PHY_PORT_SVIF & 0xff}\n+\t\t(BNXT_ULP_CF_IDX_PHY_PORT_SVIF >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_PHY_PORT_SVIF & 0xff}\n \t\t}\n \t},\n \t/* class_tid: 3, wh_plus, table: l2_cntxt_tcam.ing_0 */\n@@ -8548,8 +8572,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_PHY_PORT_SVIF >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_PHY_PORT_SVIF & 0xff}\n+\t\t(BNXT_ULP_CF_IDX_PHY_PORT_SVIF >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_PHY_PORT_SVIF & 0xff}\n \t\t}\n \t},\n \t{\n@@ -8641,13 +8665,17 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.description = \"tun_hdr_type\",\n \t\t.field_bit_size = 4,\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n-\t\t.field_src1 = BNXT_ULP_FIELD_SRC_ZERO\n+\t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n+\t\t.field_opr1 = {\n+\t\tULP_WP_SYM_TUN_HDR_TYPE_NONE}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"tun_hdr_type\",\n \t\t.field_bit_size = 4,\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n-\t\t.field_src1 = BNXT_ULP_FIELD_SRC_ZERO\n+\t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n+\t\t.field_opr1 = {\n+\t\tULP_WP_SYM_TUN_HDR_TYPE_NONE}\n \t\t}\n \t},\n \t{\n@@ -8671,7 +8699,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\t1}\n+\t\t1}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"valid\",\n@@ -8679,7 +8707,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\t1}\n+\t\t1}\n \t\t}\n \t},\n \t/* class_tid: 3, wh_plus, table: l2_cntxt_tcam_cache.ing_wr */\n@@ -8698,8 +8726,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_PHY_PORT_SVIF >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_PHY_PORT_SVIF & 0xff}\n+\t\t(BNXT_ULP_CF_IDX_PHY_PORT_SVIF >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_PHY_PORT_SVIF & 0xff}\n \t\t}\n \t},\n \t/* class_tid: 3, wh_plus, table: l2_cntxt_tcam_cache.egr_rd_vfr */\n@@ -8718,8 +8746,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_DRV_FUNC_SVIF >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_DRV_FUNC_SVIF & 0xff}\n+\t\t(BNXT_ULP_CF_IDX_DRV_FUNC_SVIF >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_DRV_FUNC_SVIF & 0xff}\n \t\t}\n \t},\n \t/* class_tid: 3, wh_plus, table: l2_cntxt_tcam_bypass.egr_vfr */\n@@ -8780,8 +8808,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_DRV_FUNC_SVIF >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_DRV_FUNC_SVIF & 0xff}\n+\t\t(BNXT_ULP_CF_IDX_DRV_FUNC_SVIF >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_DRV_FUNC_SVIF & 0xff}\n \t\t}\n \t},\n \t{\n@@ -8873,13 +8901,17 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.description = \"tun_hdr_type\",\n \t\t.field_bit_size = 4,\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n-\t\t.field_src1 = BNXT_ULP_FIELD_SRC_ZERO\n+\t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n+\t\t.field_opr1 = {\n+\t\tULP_WP_SYM_TUN_HDR_TYPE_NONE}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"tun_hdr_type\",\n \t\t.field_bit_size = 4,\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n-\t\t.field_src1 = BNXT_ULP_FIELD_SRC_ZERO\n+\t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n+\t\t.field_opr1 = {\n+\t\tULP_WP_SYM_TUN_HDR_TYPE_NONE}\n \t\t}\n \t},\n \t{\n@@ -8903,7 +8935,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\t1}\n+\t\t1}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"valid\",\n@@ -8911,7 +8943,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\t1}\n+\t\t1}\n \t\t}\n \t},\n \t/* class_tid: 3, wh_plus, table: l2_cntxt_tcam_cache.egr_wr_vfr */\n@@ -8930,8 +8962,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_DRV_FUNC_SVIF >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_DRV_FUNC_SVIF & 0xff}\n+\t\t(BNXT_ULP_CF_IDX_DRV_FUNC_SVIF >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_DRV_FUNC_SVIF & 0xff}\n \t\t}\n \t},\n \t/* class_tid: 3, wh_plus, table: l2_cntxt_tcam_cache.rd */\n@@ -8950,8 +8982,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_DRV_FUNC_SVIF >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_DRV_FUNC_SVIF & 0xff}\n+\t\t(BNXT_ULP_CF_IDX_DRV_FUNC_SVIF >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_DRV_FUNC_SVIF & 0xff}\n \t\t}\n \t},\n \t/* class_tid: 3, wh_plus, table: l2_cntxt_tcam.egr_0 */\n@@ -9012,8 +9044,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_DRV_FUNC_SVIF >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_DRV_FUNC_SVIF & 0xff}\n+\t\t(BNXT_ULP_CF_IDX_DRV_FUNC_SVIF >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_DRV_FUNC_SVIF & 0xff}\n \t\t}\n \t},\n \t{\n@@ -9105,13 +9137,17 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.description = \"tun_hdr_type\",\n \t\t.field_bit_size = 4,\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n-\t\t.field_src1 = BNXT_ULP_FIELD_SRC_ZERO\n+\t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n+\t\t.field_opr1 = {\n+\t\tULP_WP_SYM_TUN_HDR_TYPE_NONE}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"tun_hdr_type\",\n \t\t.field_bit_size = 4,\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n-\t\t.field_src1 = BNXT_ULP_FIELD_SRC_ZERO\n+\t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n+\t\t.field_opr1 = {\n+\t\tULP_WP_SYM_TUN_HDR_TYPE_NONE}\n \t\t}\n \t},\n \t{\n@@ -9135,7 +9171,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\t1}\n+\t\t1}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"valid\",\n@@ -9143,7 +9179,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\t1}\n+\t\t1}\n \t\t}\n \t},\n \t/* class_tid: 3, wh_plus, table: l2_cntxt_tcam_cache.egr_wr */\n@@ -9162,8 +9198,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_DRV_FUNC_SVIF >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_DRV_FUNC_SVIF & 0xff}\n+\t\t(BNXT_ULP_CF_IDX_DRV_FUNC_SVIF >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_DRV_FUNC_SVIF & 0xff}\n \t\t}\n \t},\n \t/* class_tid: 4, wh_plus, table: l2_cntxt_tcam_cache.vf_rd_egr */\n@@ -9182,8 +9218,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_VF_FUNC_SVIF >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_VF_FUNC_SVIF & 0xff}\n+\t\t(BNXT_ULP_CF_IDX_VF_FUNC_SVIF >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_VF_FUNC_SVIF & 0xff}\n \t\t}\n \t},\n \t/* class_tid: 4, wh_plus, table: l2_cntxt_tcam.vf_egr */\n@@ -9244,8 +9280,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_VF_FUNC_SVIF >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_VF_FUNC_SVIF & 0xff}\n+\t\t(BNXT_ULP_CF_IDX_VF_FUNC_SVIF >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_VF_FUNC_SVIF & 0xff}\n \t\t}\n \t},\n \t{\n@@ -9337,13 +9373,17 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.description = \"tun_hdr_type\",\n \t\t.field_bit_size = 4,\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n-\t\t.field_src1 = BNXT_ULP_FIELD_SRC_ZERO\n+\t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n+\t\t.field_opr1 = {\n+\t\tULP_WP_SYM_TUN_HDR_TYPE_NONE}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"tun_hdr_type\",\n \t\t.field_bit_size = 4,\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n-\t\t.field_src1 = BNXT_ULP_FIELD_SRC_ZERO\n+\t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n+\t\t.field_opr1 = {\n+\t\tULP_WP_SYM_TUN_HDR_TYPE_NONE}\n \t\t}\n \t},\n \t{\n@@ -9367,7 +9407,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\t1}\n+\t\t1}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"valid\",\n@@ -9375,7 +9415,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\t1}\n+\t\t1}\n \t\t}\n \t},\n \t/* class_tid: 4, wh_plus, table: l2_cntxt_tcam_cache.vf_egr_wr */\n@@ -9394,8 +9434,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_VF_FUNC_SVIF >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_VF_FUNC_SVIF & 0xff}\n+\t\t(BNXT_ULP_CF_IDX_VF_FUNC_SVIF >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_VF_FUNC_SVIF & 0xff}\n \t\t}\n \t},\n \t/* class_tid: 4, wh_plus, table: l2_cntxt_tcam_bypass.vf_ing */\n@@ -9456,8 +9496,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_VF_FUNC_SVIF >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_VF_FUNC_SVIF & 0xff}\n+\t\t(BNXT_ULP_CF_IDX_VF_FUNC_SVIF >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_VF_FUNC_SVIF & 0xff}\n \t\t}\n \t},\n \t{\n@@ -9549,13 +9589,17 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.description = \"tun_hdr_type\",\n \t\t.field_bit_size = 4,\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n-\t\t.field_src1 = BNXT_ULP_FIELD_SRC_ZERO\n+\t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n+\t\t.field_opr1 = {\n+\t\tULP_WP_SYM_TUN_HDR_TYPE_NONE}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"tun_hdr_type\",\n \t\t.field_bit_size = 4,\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n-\t\t.field_src1 = BNXT_ULP_FIELD_SRC_ZERO\n+\t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n+\t\t.field_opr1 = {\n+\t\tULP_WP_SYM_TUN_HDR_TYPE_NONE}\n \t\t}\n \t},\n \t{\n@@ -9579,7 +9623,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\t1}\n+\t\t1}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"valid\",\n@@ -9587,7 +9631,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\t1}\n+\t\t1}\n \t\t}\n \t},\n \t/* class_tid: 4, wh_plus, table: l2_cntxt_tcam_cache.vfr_rd_egr0 */\n@@ -9606,8 +9650,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_DRV_FUNC_SVIF >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_DRV_FUNC_SVIF & 0xff}\n+\t\t(BNXT_ULP_CF_IDX_DRV_FUNC_SVIF >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_DRV_FUNC_SVIF & 0xff}\n \t\t}\n \t},\n \t/* class_tid: 4, wh_plus, table: l2_cntxt_tcam_bypass.vfr_egr0 */\n@@ -9668,8 +9712,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_DRV_FUNC_SVIF >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_DRV_FUNC_SVIF & 0xff}\n+\t\t(BNXT_ULP_CF_IDX_DRV_FUNC_SVIF >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_DRV_FUNC_SVIF & 0xff}\n \t\t}\n \t},\n \t{\n@@ -9761,13 +9805,17 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.description = \"tun_hdr_type\",\n \t\t.field_bit_size = 4,\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n-\t\t.field_src1 = BNXT_ULP_FIELD_SRC_ZERO\n+\t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n+\t\t.field_opr1 = {\n+\t\tULP_WP_SYM_TUN_HDR_TYPE_NONE}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"tun_hdr_type\",\n \t\t.field_bit_size = 4,\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n-\t\t.field_src1 = BNXT_ULP_FIELD_SRC_ZERO\n+\t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n+\t\t.field_opr1 = {\n+\t\tULP_WP_SYM_TUN_HDR_TYPE_NONE}\n \t\t}\n \t},\n \t{\n@@ -9791,7 +9839,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\t1}\n+\t\t1}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"valid\",\n@@ -9799,7 +9847,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\t1}\n+\t\t1}\n \t\t}\n \t},\n \t/* class_tid: 4, wh_plus, table: l2_cntxt_tcam_cache.vfr_wr_egr0 */\n@@ -9818,8 +9866,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_DRV_FUNC_SVIF >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_DRV_FUNC_SVIF & 0xff}\n+\t\t(BNXT_ULP_CF_IDX_DRV_FUNC_SVIF >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_DRV_FUNC_SVIF & 0xff}\n \t\t}\n \t},\n \t/* class_tid: 4, table: l2_cntxt_tcam_bypass.vfr_dtagged_ing0 */\n@@ -9853,8 +9901,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_DEV_PORT_ID >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_DEV_PORT_ID & 0xff}\n+\t\t(BNXT_ULP_CF_IDX_DEV_PORT_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_DEV_PORT_ID & 0xff}\n \t\t}\n \t},\n \t{\n@@ -9886,8 +9934,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_DRV_FUNC_SVIF >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_DRV_FUNC_SVIF & 0xff}\n+\t\t(BNXT_ULP_CF_IDX_DRV_FUNC_SVIF >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_DRV_FUNC_SVIF & 0xff}\n \t\t}\n \t},\n \t{\n@@ -9961,7 +10009,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\t2}\n+\t\t2}\n \t\t}\n \t},\n \t{\n@@ -9993,7 +10041,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\tULP_WP_SYM_TUN_HDR_TYPE_NONE}\n+\t\tULP_WP_SYM_TUN_HDR_TYPE_NONE}\n \t\t}\n \t},\n \t{\n@@ -10017,7 +10065,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\t1}\n+\t\t1}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"valid\",\n@@ -10025,7 +10073,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\t1}\n+\t\t1}\n \t\t}\n \t},\n \t/* class_tid: 4, table: l2_cntxt_tcam_bypass.vfr_stagged_ing0 */\n@@ -10045,8 +10093,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_DEV_PORT_ID >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_DEV_PORT_ID & 0xff}\n+\t\t(BNXT_ULP_CF_IDX_DEV_PORT_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_DEV_PORT_ID & 0xff}\n \t\t}\n \t},\n \t{\n@@ -10092,8 +10140,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr1 = {\n-\t\t\t(BNXT_ULP_CF_IDX_DRV_FUNC_SVIF >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_DRV_FUNC_SVIF & 0xff}\n+\t\t(BNXT_ULP_CF_IDX_DRV_FUNC_SVIF >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_DRV_FUNC_SVIF & 0xff}\n \t\t}\n \t},\n \t{\n@@ -10167,7 +10215,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\t1}\n+\t\t1}\n \t\t}\n \t},\n \t{\n@@ -10199,7 +10247,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\tULP_WP_SYM_TUN_HDR_TYPE_NONE}\n+\t\tULP_WP_SYM_TUN_HDR_TYPE_NONE}\n \t\t}\n \t},\n \t{\n@@ -10223,7 +10271,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\t1}\n+\t\t1}\n \t\t},\n \t.field_info_spec = {\n \t\t.description = \"valid\",\n@@ -10231,7 +10279,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t\t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr1 = {\n-\t\t\t1}\n+\t\t1}\n \t\t}\n \t}\n };\n@@ -10244,8 +10292,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}\n \t},\n \t{\n \t.description = \"prof_func_id\",\n@@ -10253,8 +10301,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID >> 8) & 0xff,\n-\t\tBNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID & 0xff}\n+\t(BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID >> 8) & 0xff,\n+\tBNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID & 0xff}\n \t},\n \t{\n \t.description = \"l2_byp_lkup_en\",\n@@ -10268,8 +10316,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_CF_IDX_PHY_PORT_PARIF >> 8) & 0xff,\n-\t\tBNXT_ULP_CF_IDX_PHY_PORT_PARIF & 0xff}\n+\t(BNXT_ULP_CF_IDX_PHY_PORT_PARIF >> 8) & 0xff,\n+\tBNXT_ULP_CF_IDX_PHY_PORT_PARIF & 0xff}\n \t},\n \t{\n \t.description = \"allowed_pri\",\n@@ -10313,7 +10361,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"pri_anti_spoof_ctl\",\n@@ -10334,8 +10382,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_RID >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_RID & 0xff}\n+\t(BNXT_ULP_RF_IDX_RID >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_RID & 0xff}\n \t},\n \t{\n \t.description = \"l2_cntxt_tcam_index\",\n@@ -10349,8 +10397,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}\n \t},\n \t{\n \t.description = \"src_property_ptr\",\n@@ -10383,7 +10431,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"em_key_mask.1\",\n@@ -10391,8 +10439,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,\n-\t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff}\n+\t(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,\n+\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff}\n \t},\n \t{\n \t.description = \"em_key_mask.2\",\n@@ -10400,8 +10448,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff}\n+\t(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,\n+\tBNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff}\n \t},\n \t{\n \t.description = \"em_key_mask.3\",\n@@ -10409,8 +10457,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}\n+\t(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,\n+\tBNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}\n \t},\n \t{\n \t.description = \"em_key_mask.4\",\n@@ -10418,8 +10466,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_PROTO_ID >> 8) & 0xff,\n-\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_PROTO_ID & 0xff}\n+\t(BNXT_ULP_GLB_HF_ID_O_IPV4_PROTO_ID >> 8) & 0xff,\n+\tBNXT_ULP_GLB_HF_ID_O_IPV4_PROTO_ID & 0xff}\n \t},\n \t{\n \t.description = \"em_key_mask.5\",\n@@ -10427,16 +10475,16 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_AND_SRC2_OR_SRC3,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n-\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n+\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n+\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t.field_opr2 = {\n \t\t(BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT >> 8) & 0xff,\n \t\tBNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t.field_opr3 = {\n-\t\t(BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT >> 8) & 0xff,\n-\t\tBNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT & 0xff}\n+\t(BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT >> 8) & 0xff,\n+\tBNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT & 0xff}\n \t},\n \t{\n \t.description = \"em_key_mask.6\",\n@@ -10444,16 +10492,16 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_AND_SRC2_OR_SRC3,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n-\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n+\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n+\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t.field_opr2 = {\n \t\t(BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT >> 8) & 0xff,\n \t\tBNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t.field_opr3 = {\n-\t\t(BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT >> 8) & 0xff,\n-\t\tBNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT & 0xff}\n+\t(BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT >> 8) & 0xff,\n+\tBNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT & 0xff}\n \t},\n \t{\n \t.description = \"em_key_mask.7\",\n@@ -10479,7 +10527,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t3}\n+\t3}\n \t},\n \t{\n \t.description = \"em_profile_id\",\n@@ -10487,8 +10535,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}\n \t},\n \t{\n \t.description = \"em_search_en\",\n@@ -10496,7 +10544,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"pl_byp_lkup_en\",\n@@ -10529,7 +10577,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"em_key_mask.1\",\n@@ -10543,8 +10591,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,\n-\t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff}\n+\t(BNXT_ULP_GLB_HF_ID_O_ETH_SMAC >> 8) & 0xff,\n+\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 0xff}\n \t},\n \t{\n \t.description = \"em_key_mask.3\",\n@@ -10552,8 +10600,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 0xff}\n+\t(BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR >> 8) & 0xff,\n+\tBNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 0xff}\n \t},\n \t{\n \t.description = \"em_key_mask.4\",\n@@ -10561,8 +10609,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 0xff}\n+\t(BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR >> 8) & 0xff,\n+\tBNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 0xff}\n \t},\n \t{\n \t.description = \"em_key_mask.5\",\n@@ -10570,8 +10618,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_GLB_HF_ID_O_IPV6_PROTO_ID >> 8) & 0xff,\n-\t\tBNXT_ULP_GLB_HF_ID_O_IPV6_PROTO_ID & 0xff}\n+\t(BNXT_ULP_GLB_HF_ID_O_IPV6_PROTO_ID >> 8) & 0xff,\n+\tBNXT_ULP_GLB_HF_ID_O_IPV6_PROTO_ID & 0xff}\n \t},\n \t{\n \t.description = \"em_key_mask.6\",\n@@ -10579,16 +10627,16 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_AND_SRC2_OR_SRC3,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n-\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n+\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n+\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t.field_opr2 = {\n \t\t(BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT >> 8) & 0xff,\n \t\tBNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t.field_opr3 = {\n-\t\t(BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT >> 8) & 0xff,\n-\t\tBNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT & 0xff}\n+\t(BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT >> 8) & 0xff,\n+\tBNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT & 0xff}\n \t},\n \t{\n \t.description = \"em_key_mask.7\",\n@@ -10596,16 +10644,16 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_AND_SRC2_OR_SRC3,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n-\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n+\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n+\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t.field_opr2 = {\n \t\t(BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT >> 8) & 0xff,\n \t\tBNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t.field_opr3 = {\n-\t\t(BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT >> 8) & 0xff,\n-\t\tBNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT & 0xff}\n+\t(BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT >> 8) & 0xff,\n+\tBNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT & 0xff}\n \t},\n \t{\n \t.description = \"em_key_mask.8\",\n@@ -10625,7 +10673,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t7}\n+\t7}\n \t},\n \t{\n \t.description = \"em_profile_id\",\n@@ -10633,8 +10681,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}\n \t},\n \t{\n \t.description = \"em_search_en\",\n@@ -10642,7 +10690,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"pl_byp_lkup_en\",\n@@ -10675,7 +10723,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"em_key_mask.1\",\n@@ -10701,7 +10749,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"em_key_mask.5\",\n@@ -10709,7 +10757,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"em_key_mask.6\",\n@@ -10717,7 +10765,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"em_key_mask.7\",\n@@ -10743,7 +10791,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t20}\n+\t20}\n \t},\n \t{\n \t.description = \"em_profile_id\",\n@@ -10751,8 +10799,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}\n \t},\n \t{\n \t.description = \"em_search_en\",\n@@ -10760,7 +10808,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"pl_byp_lkup_en\",\n@@ -10775,8 +10823,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_RID >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_RID & 0xff}\n+\t(BNXT_ULP_RF_IDX_RID >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_RID & 0xff}\n \t},\n \t{\n \t.description = \"profile_tcam_index\",\n@@ -10784,8 +10832,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_PROFILE_TCAM_INDEX_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_PROFILE_TCAM_INDEX_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_PROFILE_TCAM_INDEX_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_PROFILE_TCAM_INDEX_0 & 0xff}\n \t},\n \t{\n \t.description = \"em_profile_id\",\n@@ -10793,8 +10841,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}\n \t},\n \t{\n \t.description = \"wc_profile_id\",\n@@ -10808,8 +10856,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_CF_IDX_FLOW_SIG_ID >> 8) & 0xff,\n-\t\tBNXT_ULP_CF_IDX_FLOW_SIG_ID & 0xff}\n+\t(BNXT_ULP_CF_IDX_FLOW_SIG_ID >> 8) & 0xff,\n+\tBNXT_ULP_CF_IDX_FLOW_SIG_ID & 0xff}\n \t},\n \t/* class_tid: 1, wh_plus, table: em.ipv4 */\n \t{\n@@ -10818,8 +10866,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n+\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n \t},\n \t{\n \t.description = \"ext_flow_cntr\",\n@@ -10857,7 +10905,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t3}\n+\t3}\n \t},\n \t{\n \t.description = \"l1_cacheable\",\n@@ -10871,7 +10919,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t/* class_tid: 1, wh_plus, table: eem.ipv4 */\n \t{\n@@ -10880,8 +10928,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n+\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n \t},\n \t{\n \t.description = \"ext_flow_cntr\",\n@@ -10901,8 +10949,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_ACTION_REC_SIZE >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_ACTION_REC_SIZE & 0xff}\n+\t(BNXT_ULP_RF_IDX_ACTION_REC_SIZE >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_ACTION_REC_SIZE & 0xff}\n \t},\n \t{\n \t.description = \"key_size\",\n@@ -10910,8 +10958,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t(173 >> 8) & 0xff,\n-\t\t173 & 0xff}\n+\t(173 >> 8) & 0xff,\n+\t173 & 0xff}\n \t},\n \t{\n \t.description = \"reserved\",\n@@ -10925,7 +10973,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t3}\n+\t3}\n \t},\n \t{\n \t.description = \"l1_cacheable\",\n@@ -10939,7 +10987,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t/* class_tid: 1, wh_plus, table: em.ipv6 */\n \t{\n@@ -10948,8 +10996,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n+\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n \t},\n \t{\n \t.description = \"ext_flow_cntr\",\n@@ -10987,7 +11035,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t3}\n+\t3}\n \t},\n \t{\n \t.description = \"l1_cacheable\",\n@@ -11001,7 +11049,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t/* class_tid: 1, wh_plus, table: eem.ipv6 */\n \t{\n@@ -11010,8 +11058,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n+\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n \t},\n \t{\n \t.description = \"ext_flow_cntr\",\n@@ -11031,8 +11079,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_ACTION_REC_SIZE >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_ACTION_REC_SIZE & 0xff}\n+\t(BNXT_ULP_RF_IDX_ACTION_REC_SIZE >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_ACTION_REC_SIZE & 0xff}\n \t},\n \t{\n \t.description = \"key_size\",\n@@ -11040,8 +11088,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t(413 >> 8) & 0xff,\n-\t\t413 & 0xff}\n+\t(413 >> 8) & 0xff,\n+\t413 & 0xff}\n \t},\n \t{\n \t.description = \"reserved\",\n@@ -11055,7 +11103,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t3}\n+\t3}\n \t},\n \t{\n \t.description = \"l1_cacheable\",\n@@ -11069,7 +11117,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t/* class_tid: 1, wh_plus, table: em.vxlan */\n \t{\n@@ -11078,8 +11126,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n+\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n \t},\n \t{\n \t.description = \"ext_flow_cntr\",\n@@ -11117,7 +11165,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t3}\n+\t3}\n \t},\n \t{\n \t.description = \"l1_cacheable\",\n@@ -11131,7 +11179,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t/* class_tid: 1, wh_plus, table: eem.vxlan */\n \t{\n@@ -11140,8 +11188,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n+\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n \t},\n \t{\n \t.description = \"ext_flow_cntr\",\n@@ -11161,8 +11209,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_ACTION_REC_SIZE >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_ACTION_REC_SIZE & 0xff}\n+\t(BNXT_ULP_RF_IDX_ACTION_REC_SIZE >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_ACTION_REC_SIZE & 0xff}\n \t},\n \t{\n \t.description = \"key_size\",\n@@ -11170,8 +11218,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t(197 >> 8) & 0xff,\n-\t\t197 & 0xff}\n+\t(197 >> 8) & 0xff,\n+\t197 & 0xff}\n \t},\n \t{\n \t.description = \"reserved\",\n@@ -11185,7 +11233,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t3}\n+\t3}\n \t},\n \t{\n \t.description = \"l1_cacheable\",\n@@ -11199,7 +11247,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t/* class_tid: 2, wh_plus, table: l2_cntxt_tcam.0 */\n \t{\n@@ -11208,8 +11256,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}\n \t},\n \t{\n \t.description = \"prof_func_id\",\n@@ -11217,8 +11265,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID >> 8) & 0xff,\n-\t\tBNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID & 0xff}\n+\t(BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID >> 8) & 0xff,\n+\tBNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID & 0xff}\n \t},\n \t{\n \t.description = \"l2_byp_lkup_en\",\n@@ -11232,15 +11280,15 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_CF_IDX_MATCH_PORT_IS_VFREP >> 8) & 0xff,\n-\t\tBNXT_ULP_CF_IDX_MATCH_PORT_IS_VFREP & 0xff},\n+\t(BNXT_ULP_CF_IDX_MATCH_PORT_IS_VFREP >> 8) & 0xff,\n+\tBNXT_ULP_CF_IDX_MATCH_PORT_IS_VFREP & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr2 = {\n \t\tULP_WP_SYM_LOOPBACK_PARIF},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_CF,\n \t.field_opr3 = {\n-\t\t(BNXT_ULP_CF_IDX_DRV_FUNC_PARIF >> 8) & 0xff,\n-\t\tBNXT_ULP_CF_IDX_DRV_FUNC_PARIF & 0xff}\n+\t(BNXT_ULP_CF_IDX_DRV_FUNC_PARIF >> 8) & 0xff,\n+\tBNXT_ULP_CF_IDX_DRV_FUNC_PARIF & 0xff}\n \t},\n \t{\n \t.description = \"allowed_pri\",\n@@ -11278,8 +11326,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_MAIN_SP_PTR >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_MAIN_SP_PTR & 0xff}\n+\t(BNXT_ULP_RF_IDX_MAIN_SP_PTR >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_MAIN_SP_PTR & 0xff}\n \t},\n \t{\n \t.description = \"byp_sp_lkup\",\n@@ -11287,7 +11335,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"pri_anti_spoof_ctl\",\n@@ -11308,8 +11356,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_RID >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_RID & 0xff}\n+\t(BNXT_ULP_RF_IDX_RID >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_RID & 0xff}\n \t},\n \t{\n \t.description = \"l2_cntxt_tcam_index\",\n@@ -11317,8 +11365,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0 & 0xff}\n \t},\n \t{\n \t.description = \"l2_cntxt_id\",\n@@ -11326,8 +11374,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}\n \t},\n \t{\n \t.description = \"src_property_ptr\",\n@@ -11360,7 +11408,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"em_key_mask.1\",\n@@ -11368,8 +11416,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,\n-\t\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}\n+\t(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,\n+\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}\n \t},\n \t{\n \t.description = \"em_key_mask.2\",\n@@ -11377,8 +11425,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff}\n+\t(BNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR >> 8) & 0xff,\n+\tBNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 0xff}\n \t},\n \t{\n \t.description = \"em_key_mask.3\",\n@@ -11386,8 +11434,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}\n+\t(BNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR >> 8) & 0xff,\n+\tBNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 0xff}\n \t},\n \t{\n \t.description = \"em_key_mask.4\",\n@@ -11395,8 +11443,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_GLB_HF_ID_O_IPV4_PROTO_ID >> 8) & 0xff,\n-\t\tBNXT_ULP_GLB_HF_ID_O_IPV4_PROTO_ID & 0xff}\n+\t(BNXT_ULP_GLB_HF_ID_O_IPV4_PROTO_ID >> 8) & 0xff,\n+\tBNXT_ULP_GLB_HF_ID_O_IPV4_PROTO_ID & 0xff}\n \t},\n \t{\n \t.description = \"em_key_mask.5\",\n@@ -11404,16 +11452,16 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_AND_SRC2_OR_SRC3,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n-\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n+\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n+\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t.field_opr2 = {\n \t\t(BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT >> 8) & 0xff,\n \t\tBNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t.field_opr3 = {\n-\t\t(BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT >> 8) & 0xff,\n-\t\tBNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT & 0xff}\n+\t(BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT >> 8) & 0xff,\n+\tBNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT & 0xff}\n \t},\n \t{\n \t.description = \"em_key_mask.6\",\n@@ -11421,16 +11469,16 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_AND_SRC2_OR_SRC3,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n-\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n+\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n+\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t.field_opr2 = {\n \t\t(BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT >> 8) & 0xff,\n \t\tBNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t.field_opr3 = {\n-\t\t(BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT >> 8) & 0xff,\n-\t\tBNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT & 0xff}\n+\t(BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT >> 8) & 0xff,\n+\tBNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT & 0xff}\n \t},\n \t{\n \t.description = \"em_key_mask.7\",\n@@ -11456,7 +11504,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t4}\n+\t4}\n \t},\n \t{\n \t.description = \"em_profile_id\",\n@@ -11464,8 +11512,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}\n \t},\n \t{\n \t.description = \"em_search_en\",\n@@ -11473,7 +11521,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"pl_byp_lkup_en\",\n@@ -11506,7 +11554,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"em_key_mask.1\",\n@@ -11514,8 +11562,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,\n-\t\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}\n+\t(BNXT_ULP_GLB_HF_ID_O_ETH_DMAC >> 8) & 0xff,\n+\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff}\n \t},\n \t{\n \t.description = \"em_key_mask.2\",\n@@ -11529,8 +11577,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 0xff}\n+\t(BNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR >> 8) & 0xff,\n+\tBNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 0xff}\n \t},\n \t{\n \t.description = \"em_key_mask.4\",\n@@ -11538,8 +11586,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 0xff}\n+\t(BNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR >> 8) & 0xff,\n+\tBNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 0xff}\n \t},\n \t{\n \t.description = \"em_key_mask.5\",\n@@ -11547,8 +11595,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_GLB_HF_ID_O_IPV6_PROTO_ID >> 8) & 0xff,\n-\t\tBNXT_ULP_GLB_HF_ID_O_IPV6_PROTO_ID & 0xff}\n+\t(BNXT_ULP_GLB_HF_ID_O_IPV6_PROTO_ID >> 8) & 0xff,\n+\tBNXT_ULP_GLB_HF_ID_O_IPV6_PROTO_ID & 0xff}\n \t},\n \t{\n \t.description = \"em_key_mask.6\",\n@@ -11556,16 +11604,16 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_AND_SRC2_OR_SRC3,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n-\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n+\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n+\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t.field_opr2 = {\n \t\t(BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT >> 8) & 0xff,\n \t\tBNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t.field_opr3 = {\n-\t\t(BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT >> 8) & 0xff,\n-\t\tBNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT & 0xff}\n+\t(BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT >> 8) & 0xff,\n+\tBNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT & 0xff}\n \t},\n \t{\n \t.description = \"em_key_mask.7\",\n@@ -11573,16 +11621,16 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_AND_SRC2_OR_SRC3,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n-\t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n+\t(BNXT_ULP_CF_IDX_O_L4 >> 8) & 0xff,\n+\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t.field_opr2 = {\n \t\t(BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT >> 8) & 0xff,\n \t\tBNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t.field_opr3 = {\n-\t\t(BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT >> 8) & 0xff,\n-\t\tBNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT & 0xff}\n+\t(BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT >> 8) & 0xff,\n+\tBNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT & 0xff}\n \t},\n \t{\n \t.description = \"em_key_mask.8\",\n@@ -11602,7 +11650,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t7}\n+\t7}\n \t},\n \t{\n \t.description = \"em_profile_id\",\n@@ -11610,8 +11658,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}\n \t},\n \t{\n \t.description = \"em_search_en\",\n@@ -11619,7 +11667,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"pl_byp_lkup_en\",\n@@ -11634,8 +11682,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_RID >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_RID & 0xff}\n+\t(BNXT_ULP_RF_IDX_RID >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_RID & 0xff}\n \t},\n \t{\n \t.description = \"profile_tcam_index\",\n@@ -11643,8 +11691,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_PROFILE_TCAM_INDEX_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_PROFILE_TCAM_INDEX_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_PROFILE_TCAM_INDEX_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_PROFILE_TCAM_INDEX_0 & 0xff}\n \t},\n \t{\n \t.description = \"em_profile_id\",\n@@ -11652,8 +11700,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}\n \t},\n \t{\n \t.description = \"wc_profile_id\",\n@@ -11667,8 +11715,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_CF_IDX_FLOW_SIG_ID >> 8) & 0xff,\n-\t\tBNXT_ULP_CF_IDX_FLOW_SIG_ID & 0xff}\n+\t(BNXT_ULP_CF_IDX_FLOW_SIG_ID >> 8) & 0xff,\n+\tBNXT_ULP_CF_IDX_FLOW_SIG_ID & 0xff}\n \t},\n \t/* class_tid: 2, wh_plus, table: em.ipv4 */\n \t{\n@@ -11677,8 +11725,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n+\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n \t},\n \t{\n \t.description = \"ext_flow_cntr\",\n@@ -11716,7 +11764,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t3}\n+\t3}\n \t},\n \t{\n \t.description = \"l1_cacheable\",\n@@ -11730,7 +11778,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t/* class_tid: 2, wh_plus, table: eem.ipv4 */\n \t{\n@@ -11739,8 +11787,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n+\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n \t},\n \t{\n \t.description = \"ext_flow_cntr\",\n@@ -11760,8 +11808,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_ACTION_REC_SIZE >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_ACTION_REC_SIZE & 0xff}\n+\t(BNXT_ULP_RF_IDX_ACTION_REC_SIZE >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_ACTION_REC_SIZE & 0xff}\n \t},\n \t{\n \t.description = \"key_size\",\n@@ -11769,8 +11817,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t(173 >> 8) & 0xff,\n-\t\t173 & 0xff}\n+\t(173 >> 8) & 0xff,\n+\t173 & 0xff}\n \t},\n \t{\n \t.description = \"reserved\",\n@@ -11784,7 +11832,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t3}\n+\t3}\n \t},\n \t{\n \t.description = \"l1_cacheable\",\n@@ -11798,7 +11846,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t/* class_tid: 2, wh_plus, table: em.ipv6 */\n \t{\n@@ -11807,8 +11855,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n+\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n \t},\n \t{\n \t.description = \"ext_flow_cntr\",\n@@ -11846,7 +11894,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t3}\n+\t3}\n \t},\n \t{\n \t.description = \"l1_cacheable\",\n@@ -11860,7 +11908,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t/* class_tid: 2, wh_plus, table: eem.ipv6 */\n \t{\n@@ -11869,8 +11917,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n+\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n \t},\n \t{\n \t.description = \"ext_flow_cntr\",\n@@ -11890,8 +11938,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_ACTION_REC_SIZE >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_ACTION_REC_SIZE & 0xff}\n+\t(BNXT_ULP_RF_IDX_ACTION_REC_SIZE >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_ACTION_REC_SIZE & 0xff}\n \t},\n \t{\n \t.description = \"key_size\",\n@@ -11899,8 +11947,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t(413 >> 8) & 0xff,\n-\t\t413 & 0xff}\n+\t(413 >> 8) & 0xff,\n+\t413 & 0xff}\n \t},\n \t{\n \t.description = \"reserved\",\n@@ -11914,7 +11962,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t3}\n+\t3}\n \t},\n \t{\n \t.description = \"l1_cacheable\",\n@@ -11928,7 +11976,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t/* class_tid: 3, wh_plus, table: int_full_act_record.ing_0 */\n \t{\n@@ -12051,8 +12099,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_CF_IDX_DRV_FUNC_VNIC >> 8) & 0xff,\n-\t\tBNXT_ULP_CF_IDX_DRV_FUNC_VNIC & 0xff}\n+\t(BNXT_ULP_CF_IDX_DRV_FUNC_VNIC >> 8) & 0xff,\n+\tBNXT_ULP_CF_IDX_DRV_FUNC_VNIC & 0xff}\n \t},\n \t{\n \t.description = \"pop_vlan\",\n@@ -12097,8 +12145,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}\n \t},\n \t{\n \t.description = \"prof_func_id\",\n@@ -12106,8 +12154,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n-\t\tBNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID & 0xff}\n+\t(BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n+\tBNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID & 0xff}\n \t},\n \t{\n \t.description = \"l2_byp_lkup_en\",\n@@ -12121,8 +12169,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_CF_IDX_PHY_PORT_PARIF >> 8) & 0xff,\n-\t\tBNXT_ULP_CF_IDX_PHY_PORT_PARIF & 0xff}\n+\t(BNXT_ULP_CF_IDX_PHY_PORT_PARIF >> 8) & 0xff,\n+\tBNXT_ULP_CF_IDX_PHY_PORT_PARIF & 0xff}\n \t},\n \t{\n \t.description = \"allowed_pri\",\n@@ -12166,7 +12214,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"pri_anti_spoof_ctl\",\n@@ -12187,8 +12235,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_RID >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_RID & 0xff}\n+\t(BNXT_ULP_RF_IDX_RID >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_RID & 0xff}\n \t},\n \t{\n \t.description = \"l2_cntxt_tcam_index\",\n@@ -12196,8 +12244,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0 & 0xff}\n \t},\n \t{\n \t.description = \"l2_cntxt_id\",\n@@ -12205,8 +12253,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}\n \t},\n \t{\n \t.description = \"src_property_ptr\",\n@@ -12221,8 +12269,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n+\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n \t},\n \t/* class_tid: 3, wh_plus, table: parif_def_arec_ptr.ing_0 */\n \t{\n@@ -12231,8 +12279,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n+\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n \t},\n \t/* class_tid: 3, wh_plus, table: parif_def_err_arec_ptr.ing_0 */\n \t{\n@@ -12241,8 +12289,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n+\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n \t},\n \t/* class_tid: 3, wh_plus, table: int_full_act_record.egr_vfr */\n \t{\n@@ -12365,8 +12413,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_CF_IDX_PHY_PORT_VPORT >> 8) & 0xff,\n-\t\tBNXT_ULP_CF_IDX_PHY_PORT_VPORT & 0xff}\n+\t(BNXT_ULP_CF_IDX_PHY_PORT_VPORT >> 8) & 0xff,\n+\tBNXT_ULP_CF_IDX_PHY_PORT_VPORT & 0xff}\n \t},\n \t{\n \t.description = \"pop_vlan\",\n@@ -12423,7 +12471,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"parif\",\n@@ -12431,8 +12479,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_CF_IDX_DRV_FUNC_PARIF >> 8) & 0xff,\n-\t\tBNXT_ULP_CF_IDX_DRV_FUNC_PARIF & 0xff}\n+\t(BNXT_ULP_CF_IDX_DRV_FUNC_PARIF >> 8) & 0xff,\n+\tBNXT_ULP_CF_IDX_DRV_FUNC_PARIF & 0xff}\n \t},\n \t{\n \t.description = \"allowed_pri\",\n@@ -12464,7 +12512,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"sp_rec_ptr\",\n@@ -12478,7 +12526,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"pri_anti_spoof_ctl\",\n@@ -12499,8 +12547,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_RID >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_RID & 0xff}\n+\t(BNXT_ULP_RF_IDX_RID >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_RID & 0xff}\n \t},\n \t{\n \t.description = \"l2_cntxt_tcam_index\",\n@@ -12508,8 +12556,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0 & 0xff}\n \t},\n \t{\n \t.description = \"l2_cntxt_id\",\n@@ -12530,8 +12578,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}\n \t},\n \t{\n \t.description = \"prof_func_id\",\n@@ -12539,8 +12587,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n-\t\tBNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID & 0xff}\n+\t(BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n+\tBNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID & 0xff}\n \t},\n \t{\n \t.description = \"l2_byp_lkup_en\",\n@@ -12554,8 +12602,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_CF_IDX_DRV_FUNC_PARIF >> 8) & 0xff,\n-\t\tBNXT_ULP_CF_IDX_DRV_FUNC_PARIF & 0xff}\n+\t(BNXT_ULP_CF_IDX_DRV_FUNC_PARIF >> 8) & 0xff,\n+\tBNXT_ULP_CF_IDX_DRV_FUNC_PARIF & 0xff}\n \t},\n \t{\n \t.description = \"allowed_pri\",\n@@ -12599,7 +12647,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"pri_anti_spoof_ctl\",\n@@ -12620,8 +12668,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_RID >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_RID & 0xff}\n+\t(BNXT_ULP_RF_IDX_RID >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_RID & 0xff}\n \t},\n \t{\n \t.description = \"l2_cntxt_tcam_index\",\n@@ -12629,8 +12677,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0 & 0xff}\n \t},\n \t{\n \t.description = \"l2_cntxt_id\",\n@@ -12638,8 +12686,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}\n \t},\n \t{\n \t.description = \"src_property_ptr\",\n@@ -12768,8 +12816,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_CF_IDX_PHY_PORT_VPORT >> 8) & 0xff,\n-\t\tBNXT_ULP_CF_IDX_PHY_PORT_VPORT & 0xff}\n+\t(BNXT_ULP_CF_IDX_PHY_PORT_VPORT >> 8) & 0xff,\n+\tBNXT_ULP_CF_IDX_PHY_PORT_VPORT & 0xff}\n \t},\n \t{\n \t.description = \"pop_vlan\",\n@@ -12814,8 +12862,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n+\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n \t},\n \t/* class_tid: 3, wh_plus, table: parif_def_arec_ptr.egr_0 */\n \t{\n@@ -12824,8 +12872,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n+\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n \t},\n \t/* class_tid: 3, wh_plus, table: parif_def_err_arec_ptr.egr_0 */\n \t{\n@@ -12834,8 +12882,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n+\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n \t},\n \t/* class_tid: 4, wh_plus, table: int_full_act_record.loopback */\n \t{\n@@ -12958,8 +13006,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t(ULP_WP_SYM_LOOPBACK_PORT >> 8) & 0xff,\n-\t\tULP_WP_SYM_LOOPBACK_PORT & 0xff}\n+\t(ULP_WP_SYM_LOOPBACK_PORT >> 8) & 0xff,\n+\tULP_WP_SYM_LOOPBACK_PORT & 0xff}\n \t},\n \t{\n \t.description = \"pop_vlan\",\n@@ -13004,8 +13052,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}\n \t},\n \t{\n \t.description = \"prof_func_id\",\n@@ -13013,8 +13061,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n-\t\tBNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID & 0xff}\n+\t(BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n+\tBNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID & 0xff}\n \t},\n \t{\n \t.description = \"l2_byp_lkup_en\",\n@@ -13028,7 +13076,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\tULP_WP_SYM_LOOPBACK_PARIF}\n+\tULP_WP_SYM_LOOPBACK_PARIF}\n \t},\n \t{\n \t.description = \"allowed_pri\",\n@@ -13072,7 +13120,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"pri_anti_spoof_ctl\",\n@@ -13093,8 +13141,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_RID >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_RID & 0xff}\n+\t(BNXT_ULP_RF_IDX_RID >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_RID & 0xff}\n \t},\n \t{\n \t.description = \"l2_cntxt_tcam_index\",\n@@ -13102,8 +13150,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0 & 0xff}\n \t},\n \t{\n \t.description = \"l2_cntxt_id\",\n@@ -13111,8 +13159,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}\n \t},\n \t{\n \t.description = \"src_property_ptr\",\n@@ -13127,8 +13175,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR >> 8) & 0xff,\n-\t\tBNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR & 0xff}\n+\t(BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR >> 8) & 0xff,\n+\tBNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR & 0xff}\n \t},\n \t/* class_tid: 4, wh_plus, table: parif_def_arec_ptr.vf_egr */\n \t{\n@@ -13137,8 +13185,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR >> 8) & 0xff,\n-\t\tBNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR & 0xff}\n+\t(BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR >> 8) & 0xff,\n+\tBNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR & 0xff}\n \t},\n \t/* class_tid: 4, wh_plus, table: parif_def_err_arec_ptr.vf_egr */\n \t{\n@@ -13147,8 +13195,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR >> 8) & 0xff,\n-\t\tBNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR & 0xff}\n+\t(BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR >> 8) & 0xff,\n+\tBNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR & 0xff}\n \t},\n \t/* class_tid: 4, wh_plus, table: int_full_act_record.vf_ing */\n \t{\n@@ -13271,8 +13319,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_CF_IDX_DRV_FUNC_VNIC >> 8) & 0xff,\n-\t\tBNXT_ULP_CF_IDX_DRV_FUNC_VNIC & 0xff}\n+\t(BNXT_ULP_CF_IDX_DRV_FUNC_VNIC >> 8) & 0xff,\n+\tBNXT_ULP_CF_IDX_DRV_FUNC_VNIC & 0xff}\n \t},\n \t{\n \t.description = \"pop_vlan\",\n@@ -13317,8 +13365,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n+\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n \t},\n \t{\n \t.description = \"reserved\",\n@@ -13332,7 +13380,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"parif\",\n@@ -13382,7 +13430,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"pri_anti_spoof_ctl\",\n@@ -13415,7 +13463,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"parif\",\n@@ -13453,7 +13501,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"sp_rec_ptr\",\n@@ -13467,7 +13515,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"pri_anti_spoof_ctl\",\n@@ -13488,8 +13536,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_RID >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_RID & 0xff}\n+\t(BNXT_ULP_RF_IDX_RID >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_RID & 0xff}\n \t},\n \t{\n \t.description = \"l2_cntxt_tcam_index\",\n@@ -13497,8 +13545,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0 & 0xff}\n \t},\n \t{\n \t.description = \"l2_cntxt_id\",\n@@ -13543,7 +13591,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\tULP_WP_SYM_ECV_VTAG_TYPE_ADD_1_ENCAP_PRI}\n+\tULP_WP_SYM_ECV_VTAG_TYPE_ADD_1_ENCAP_PRI}\n \t},\n \t{\n \t.description = \"ecv_custom_en\",\n@@ -13557,7 +13605,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"vtag_tpid\",\n@@ -13574,8 +13622,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_CF_IDX_DEV_PORT_ID >> 8) & 0xff,\n-\t\tBNXT_ULP_CF_IDX_DEV_PORT_ID & 0xff}\n+\t(BNXT_ULP_CF_IDX_DEV_PORT_ID >> 8) & 0xff,\n+\tBNXT_ULP_CF_IDX_DEV_PORT_ID & 0xff}\n \t},\n \t{\n \t.description = \"vtag_de\",\n@@ -13650,8 +13698,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_ENCAP_PTR_0 >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_ENCAP_PTR_0 & 0xff}\n+\t(BNXT_ULP_RF_IDX_ENCAP_PTR_0 >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_ENCAP_PTR_0 & 0xff}\n \t},\n \t{\n \t.description = \"dst_ip_ptr\",\n@@ -13719,8 +13767,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t(ULP_WP_SYM_LOOPBACK_PORT >> 8) & 0xff,\n-\t\tULP_WP_SYM_LOOPBACK_PORT & 0xff}\n+\t(ULP_WP_SYM_LOOPBACK_PORT >> 8) & 0xff,\n+\tULP_WP_SYM_LOOPBACK_PORT & 0xff}\n \t},\n \t{\n \t.description = \"pop_vlan\",\n@@ -13879,8 +13927,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_CF_IDX_VF_FUNC_VNIC >> 8) & 0xff,\n-\t\tBNXT_ULP_CF_IDX_VF_FUNC_VNIC & 0xff}\n+\t(BNXT_ULP_CF_IDX_VF_FUNC_VNIC >> 8) & 0xff,\n+\tBNXT_ULP_CF_IDX_VF_FUNC_VNIC & 0xff}\n \t},\n \t{\n \t.description = \"pop_vlan\",\n@@ -13888,7 +13936,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"meter\",\n@@ -13927,8 +13975,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n+\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n \t},\n \t{\n \t.description = \"reserved\",\n@@ -13942,7 +13990,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"parif\",\n@@ -13992,7 +14040,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"pri_anti_spoof_ctl\",\n@@ -14013,8 +14061,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr1 = {\n-\t\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n+\t(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}\n \t},\n \t{\n \t.description = \"reserved\",\n@@ -14028,7 +14076,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"parif\",\n@@ -14078,7 +14126,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1,\n \t.field_src1 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr1 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"pri_anti_spoof_ctl\",\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_template_struct.h b/drivers/net/bnxt/tf_ulp/ulp_template_struct.h\nindex 72d0df98a8..2d03ea4fdb 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_template_struct.h\n+++ b/drivers/net/bnxt/tf_ulp/ulp_template_struct.h\n@@ -284,6 +284,9 @@ struct bnxt_ulp_mapper_tbl_info {\n \t/* FDB table opcode */\n \tenum bnxt_ulp_fdb_opc\t\tfdb_opcode;\n \tuint32_t\t\t\tfdb_operand;\n+\n+\t/* Shared session */\n+\tenum bnxt_ulp_shared_session\tshared_session;\n };\n \n struct bnxt_ulp_mapper_field_info {\n", "prefixes": [ "52/58" ] }