Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 103412,
    "url": "http://patches.dpdk.org/api/patches/103412/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/20211102040556.7840-14-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": "<20211102040556.7840-14-venkatkumar.duvvuru@broadcom.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20211102040556.7840-14-venkatkumar.duvvuru@broadcom.com",
    "date": "2021-11-02T04:05:49",
    "name": "[v3,13/20] net/bnxt: add support for socket direct feature",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "3974ea49c76eb0e77989d764c59f4b6c2e928ce1",
    "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/20211102040556.7840-14-venkatkumar.duvvuru@broadcom.com/mbox/",
    "series": [
        {
            "id": 20191,
            "url": "http://patches.dpdk.org/api/series/20191/?format=api",
            "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=20191",
            "date": "2021-11-02T04:05:36",
            "name": "fixes and enhancements to Truflow",
            "version": 3,
            "mbox": "http://patches.dpdk.org/series/20191/mbox/"
        }
    ],
    "comments": "http://patches.dpdk.org/api/patches/103412/comments/",
    "check": "warning",
    "checks": "http://patches.dpdk.org/api/patches/103412/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 99AE3A0C4D;\n\tTue,  2 Nov 2021 05:07:43 +0100 (CET)",
            "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id E404841177;\n\tTue,  2 Nov 2021 05:06:28 +0100 (CET)",
            "from relay.smtp-ext.broadcom.com (relay.smtp-ext.broadcom.com\n [192.19.166.228])\n by mails.dpdk.org (Postfix) with ESMTP id 0A8F341177\n for <dev@dpdk.org>; Tue,  2 Nov 2021 05:06:27 +0100 (CET)",
            "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 14AFBEA;\n Mon,  1 Nov 2021 21:06:24 -0700 (PDT)"
        ],
        "DKIM-Filter": "OpenDKIM Filter v2.11.0 relay.smtp-ext.broadcom.com 14AFBEA",
        "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com;\n s=dkimrelay; t=1635825986;\n bh=QsGbu10d0pqTcHpYcUpqpV4sBODkuBcIBB26tDBCc8c=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=qYUs1a3juNECY3jSmWUeD2f7lBNT2mydwBtwdVCp7Ir+YjjJPctyeg0vVy45lb5v6\n wlDBbQdkY5OTN1J8zE8F/tXGUy7aHrU08g7sOAanQmYAB/e3CO8UrEvzNdaMwHcg4R\n YU6BTvqziJRQTuIu63mteIHAOINBJ7Q5W/0d9N2E=",
        "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": "Tue,  2 Nov 2021 09:35:49 +0530",
        "Message-Id": "<20211102040556.7840-14-venkatkumar.duvvuru@broadcom.com>",
        "X-Mailer": "git-send-email 2.17.1",
        "In-Reply-To": "<20211102040556.7840-1-venkatkumar.duvvuru@broadcom.com>",
        "References": "<20211001055909.27276-1-venkatkumar.duvvuru@broadcom.com>\n <20211102040556.7840-1-venkatkumar.duvvuru@broadcom.com>",
        "Subject": "[dpdk-dev] [PATCH v3 13/20] net/bnxt: add support for socket direct\n feature",
        "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\nAdded support for socket direct feature. This feature\nallows to ignore the incoming interface and use other fields\nin the packet to identify the flow and forward.\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: Randy Schacher <stuart.schacher@broadcom.com>\n---\n drivers/net/bnxt/tf_ulp/bnxt_ulp.c            |    2 +\n drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c       |   23 +-\n .../generic_templates/ulp_template_db_enum.h  |   71 +-\n .../generic_templates/ulp_template_db_tbl.c   | 3917 +++++++++++++----\n .../ulp_template_db_thor_act.c                |  150 +-\n .../ulp_template_db_thor_class.c              |  660 +--\n .../ulp_template_db_wh_plus_act.c             |  242 +-\n .../ulp_template_db_wh_plus_class.c           |  222 +-\n drivers/net/bnxt/tf_ulp/ulp_rte_parser.c      |    5 +\n 9 files changed, 3699 insertions(+), 1593 deletions(-)",
    "diff": "diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c\nindex 21f71d6445..14be079eaa 100644\n--- a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c\n+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c\n@@ -340,6 +340,8 @@ bnxt_ulp_cntxt_app_caps_init(struct bnxt *bp,\n \t\t\tif (BNXT_MULTIROOT_EN(bp))\n \t\t\t\tulp_ctx->cfg_data->ulp_flags |=\n \t\t\t\t\tBNXT_ULP_APP_SOCKET_DIRECT;\n+\t\t\t\tBNXT_TF_DBG(DEBUG,\n+\t\t\t\t\t    \"Socket Direct feature is enabled\");\n \t\t}\n \t}\n \tif (!found) {\ndiff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c b/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c\nindex 272195f6a2..55885d1b8c 100644\n--- a/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c\n+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c\n@@ -133,8 +133,27 @@ bnxt_ulp_init_mapper_params(struct bnxt_ulp_mapper_create_parms *mapper_cparms,\n \t}\n \n \t/* Update the socket direct flag */\n-\tif (ULP_SOCKET_DIRECT_IS_ENABLED(ulp_flags))\n-\t\tULP_COMP_FLD_IDX_WR(params, BNXT_ULP_CF_IDX_SOCKET_DIRECT, 1);\n+\tif (ULP_BITMAP_ISSET(params->hdr_bitmap.bits,\n+\t\t\t     BNXT_ULP_HDR_BIT_SVIF_IGNORE)) {\n+\t\tuint32_t ifindex;\n+\t\tuint16_t vport;\n+\n+\t\t/* Get the port db ifindex */\n+\t\tif (ulp_port_db_dev_port_to_ulp_index(params->ulp_ctx,\n+\t\t\t\t\t\t      params->port_id,\n+\t\t\t\t\t\t      &ifindex)) {\n+\t\t\tBNXT_TF_DBG(ERR, \"Invalid port id %u\\n\",\n+\t\t\t\t    params->port_id);\n+\t\t\treturn;\n+\t\t}\n+\t\t/* Update the phy port of the other interface */\n+\t\tif (ulp_port_db_vport_get(params->ulp_ctx, ifindex, &vport)) {\n+\t\t\tBNXT_TF_DBG(ERR, \"Invalid port if index %u\\n\", ifindex);\n+\t\t\treturn;\n+\t\t}\n+\t\tULP_COMP_FLD_IDX_WR(params, BNXT_ULP_CF_IDX_SOCKET_DIRECT_VPORT,\n+\t\t\t\t    (vport == 1) ? 2 : 1);\n+\t}\n }\n \n /* Function to create the rte flow. */\ndiff --git a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_enum.h b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_enum.h\nindex 8706e45f28..c01ae1601d 100644\n--- a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_enum.h\n+++ b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_enum.h\n@@ -3,15 +3,15 @@\n  * All rights reserved.\n  */\n \n-/* date: Thu Sep  9 12:11:08 2021 */\n+/* date: Fri Oct  8 11:41:10 2021 */\n \n #ifndef ULP_TEMPLATE_DB_H_\n #define ULP_TEMPLATE_DB_H_\n \n-#define BNXT_ULP_REGFILE_MAX_SZ 42\n+#define BNXT_ULP_REGFILE_MAX_SZ 46\n #define BNXT_ULP_MAX_NUM_DEVICES 4\n #define BNXT_ULP_LOG2_MAX_NUM_DEV 2\n-#define BNXT_ULP_GEN_TBL_MAX_SZ 16\n+#define BNXT_ULP_GEN_TBL_MAX_SZ 18\n #define BNXT_ULP_CLASS_SIG_TBL_MAX_SZ 65536\n #define BNXT_ULP_CLASS_MATCH_LIST_MAX_SZ 993\n #define BNXT_ULP_CLASS_HID_LOW_PRIME 6701\n@@ -26,11 +26,11 @@\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_APP_RESOURCE_RESV_LIST_MAX_SZ 8\n-#define BNXT_ULP_GLB_RESOURCE_TBL_MAX_SZ 110\n-#define BNXT_ULP_APP_GLB_RESOURCE_TBL_MAX_SZ 50\n-#define BNXT_ULP_RESOURCE_RESV_LIST_MAX_SZ 277\n-#define BNXT_ULP_APP_CAP_TBL_MAX_SZ 8\n+#define BNXT_ULP_APP_RESOURCE_RESV_LIST_MAX_SZ 16\n+#define BNXT_ULP_GLB_RESOURCE_TBL_MAX_SZ 132\n+#define BNXT_ULP_APP_GLB_RESOURCE_TBL_MAX_SZ 140\n+#define BNXT_ULP_RESOURCE_RESV_LIST_MAX_SZ 409\n+#define BNXT_ULP_APP_CAP_TBL_MAX_SZ 12\n #define BNXT_ULP_COND_GOTO_REJECT 1023\n #define BNXT_ULP_COND_GOTO_RF 0x10000\n #define BNXT_ULP_GLB_FIELD_TBL_SHIFT 7\n@@ -114,7 +114,8 @@ enum bnxt_ulp_hdr_bit {\n \tBNXT_ULP_HDR_BIT_I_ICMP              = 0x0000000000020000,\n \tBNXT_ULP_HDR_BIT_F1                  = 0x0000000000040000,\n \tBNXT_ULP_HDR_BIT_F2                  = 0x0000000000080000,\n-\tBNXT_ULP_HDR_BIT_LAST                = 0x0000000000100000\n+\tBNXT_ULP_HDR_BIT_SVIF_IGNORE         = 0x0000000000100000,\n+\tBNXT_ULP_HDR_BIT_LAST                = 0x0000000000200000\n };\n \n enum bnxt_ulp_accept_opc {\n@@ -212,7 +213,8 @@ enum bnxt_ulp_cf_idx {\n \tBNXT_ULP_CF_IDX_IO_VLAN_FB_VID = 72,\n \tBNXT_ULP_CF_IDX_II_VLAN_FB_VID = 73,\n \tBNXT_ULP_CF_IDX_SOCKET_DIRECT = 74,\n-\tBNXT_ULP_CF_IDX_LAST = 75\n+\tBNXT_ULP_CF_IDX_SOCKET_DIRECT_VPORT = 75,\n+\tBNXT_ULP_CF_IDX_LAST = 76\n };\n \n enum bnxt_ulp_cond_list_opc {\n@@ -427,21 +429,31 @@ enum bnxt_ulp_glb_rf_idx {\n \tBNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0 = 37,\n \tBNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_1 = 38,\n \tBNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_2 = 39,\n-\tBNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0 = 40,\n-\tBNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1 = 41,\n-\tBNXT_ULP_GLB_RF_IDX_APP_GLB_EM_PROFILE_ID_0 = 42,\n-\tBNXT_ULP_GLB_RF_IDX_APP_GLB_EM_PROFILE_ID_1 = 43,\n-\tBNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0 = 44,\n-\tBNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_1 = 45,\n-\tBNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_2 = 46,\n-\tBNXT_ULP_GLB_RF_IDX_APP_GLB_EM_KEY_ID_0 = 47,\n-\tBNXT_ULP_GLB_RF_IDX_APP_GLB_EM_KEY_ID_1 = 48,\n-\tBNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_0 = 49,\n-\tBNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_1 = 50,\n-\tBNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_0 = 51,\n-\tBNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_1 = 52,\n-\tBNXT_ULP_GLB_RF_IDX_GRE_PROF_FUNC_ID = 53,\n-\tBNXT_ULP_GLB_RF_IDX_LAST = 54\n+\tBNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_3 = 40,\n+\tBNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0 = 41,\n+\tBNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1 = 42,\n+\tBNXT_ULP_GLB_RF_IDX_APP_GLB_EM_PROFILE_ID_0 = 43,\n+\tBNXT_ULP_GLB_RF_IDX_APP_GLB_EM_PROFILE_ID_1 = 44,\n+\tBNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0 = 45,\n+\tBNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_1 = 46,\n+\tBNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_2 = 47,\n+\tBNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_3 = 48,\n+\tBNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_4 = 49,\n+\tBNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_5 = 50,\n+\tBNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_6 = 51,\n+\tBNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_7 = 52,\n+\tBNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_8 = 53,\n+\tBNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_9 = 54,\n+\tBNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_10 = 55,\n+\tBNXT_ULP_GLB_RF_IDX_APP_GLB_EM_KEY_ID_0 = 56,\n+\tBNXT_ULP_GLB_RF_IDX_APP_GLB_EM_KEY_ID_1 = 57,\n+\tBNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_0 = 58,\n+\tBNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_1 = 59,\n+\tBNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_2 = 60,\n+\tBNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_0 = 61,\n+\tBNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_1 = 62,\n+\tBNXT_ULP_GLB_RF_IDX_GRE_PROF_FUNC_ID = 63,\n+\tBNXT_ULP_GLB_RF_IDX_LAST = 64\n };\n \n enum bnxt_ulp_hdr_type {\n@@ -555,7 +567,11 @@ enum bnxt_ulp_rf_idx {\n \tBNXT_ULP_RF_IDX_PHY_PORT = 39,\n \tBNXT_ULP_RF_IDX_METADATA_PROF = 40,\n \tBNXT_ULP_RF_IDX_MODIFY_PTR = 41,\n-\tBNXT_ULP_RF_IDX_LAST = 42\n+\tBNXT_ULP_RF_IDX_SOCK_DIR_SVIF = 42,\n+\tBNXT_ULP_RF_IDX_SOCK_DIR_PARIF = 43,\n+\tBNXT_ULP_RF_IDX_SOCK_DIR_ACT_PTR = 44,\n+\tBNXT_ULP_RF_IDX_SOCK_DIR_PARENT_MAC = 45,\n+\tBNXT_ULP_RF_IDX_LAST = 46\n };\n \n enum bnxt_ulp_shared_session {\n@@ -627,7 +643,8 @@ enum bnxt_ulp_resource_sub_type {\n \tBNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PORT_TABLE = 4,\n \tBNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_TUNNEL_CACHE = 5,\n \tBNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_SOURCE_PROPERTY_CACHE = 6,\n-\tBNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_VXLAN_ENCAP_REC_CACHE = 7\n+\tBNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_VXLAN_ENCAP_REC_CACHE = 7,\n+\tBNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_SOCKET_DIRECT_CACHE = 8\n };\n \n enum bnxt_ulp_act_prop_sz {\ndiff --git a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_tbl.c b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_tbl.c\nindex e43e341927..d5aea4d456 100644\n--- a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_tbl.c\n+++ b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_tbl.c\n@@ -3,7 +3,7 @@\n  * All rights reserved.\n  */\n \n-/* date: Thu Sep 16 11:49:55 2021 */\n+/* date: Fri Oct  8 11:41:10 2021 */\n \n #include \"ulp_template_db_enum.h\"\n #include \"ulp_template_db_field.h\"\n@@ -171,6 +171,26 @@ struct bnxt_ulp_generic_tbl_params ulp_generic_tbl_params[] = {\n \t.num_buckets             = 8,\n \t.hash_tbl_entries        = 16384,\n \t.result_byte_order       = BNXT_ULP_BYTE_ORDER_LE\n+\t},\n+\t[BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_SOCKET_DIRECT_CACHE << 1 |\n+\t\tBNXT_ULP_DIRECTION_INGRESS] = {\n+\t.name                    = \"INGRESS GEN_TABLE_SOCKET_DIRECT_CACHE\",\n+\t.result_num_entries      = 16,\n+\t.result_num_bytes        = 14,\n+\t.key_num_bytes           = 0,\n+\t.num_buckets             = 0,\n+\t.hash_tbl_entries        = 0,\n+\t.result_byte_order       = BNXT_ULP_BYTE_ORDER_LE\n+\t},\n+\t[BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_SOCKET_DIRECT_CACHE << 1 |\n+\t\tBNXT_ULP_DIRECTION_EGRESS] = {\n+\t.name                    = \"EGRESS GEN_TABLE_SOCKET_DIRECT_CACHE\",\n+\t.result_num_entries      = 16,\n+\t.result_num_bytes        = 14,\n+\t.key_num_bytes           = 0,\n+\t.num_buckets             = 0,\n+\t.hash_tbl_entries        = 0,\n+\t.result_byte_order       = BNXT_ULP_BYTE_ORDER_LE\n \t}\n };\n \n@@ -371,6 +391,33 @@ struct bnxt_ulp_app_capabilities_info ulp_app_cap_info_list[] = {\n \t.app_id                  = 3,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\n \t.flags                   = BNXT_ULP_APP_CAP_UNICAST_ONLY\n+\t},\n+\t{\n+\t.app_id                  = 4,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\n+\t.flags                   = BNXT_ULP_APP_CAP_SHARED_EN |\n+\t\t\t\t   BNXT_ULP_APP_CAP_HOT_UPGRADE_EN |\n+\t\t\t\t   BNXT_ULP_APP_CAP_UNICAST_ONLY\n+\t},\n+\t{\n+\t.app_id                  = 4,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\n+\t.flags                   = BNXT_ULP_APP_CAP_SHARED_EN |\n+\t\t\t\t   BNXT_ULP_APP_CAP_HOT_UPGRADE_EN |\n+\t\t\t\t   BNXT_ULP_APP_CAP_UNICAST_ONLY |\n+\t\t\t\t   BNXT_ULP_APP_CAP_SOCKET_DIRECT\n+\t},\n+\t{\n+\t.app_id                  = 5,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\n+\t.flags                   = BNXT_ULP_APP_CAP_SHARED_EN |\n+\t\t\t\t   BNXT_ULP_APP_CAP_UNICAST_ONLY\n+\t},\n+\t{\n+\t.app_id                  = 5,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\n+\t.flags                   = BNXT_ULP_APP_CAP_SHARED_EN |\n+\t\t\t\t   BNXT_ULP_APP_CAP_UNICAST_ONLY\n \t}\n };\n \n@@ -439,6 +486,70 @@ struct bnxt_ulp_resource_resv_info ulp_app_resource_resv_list[] = {\n \t.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n \t.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,\n \t.count                   = 1024\n+\t},\n+\t{\n+\t.app_id                  = 4,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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                   = 2\n+\t},\n+\t{\n+\t.app_id                  = 4,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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                   = 128\n+\t},\n+\t{\n+\t.app_id                  = 4,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 2\n+\t},\n+\t{\n+\t.app_id                  = 4,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 1024\n+\t},\n+\t{\n+\t.app_id                  = 5,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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                   = 2\n+\t},\n+\t{\n+\t.app_id                  = 5,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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                   = 128\n+\t},\n+\t{\n+\t.app_id                  = 5,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 2\n+\t},\n+\t{\n+\t.app_id                  = 5,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 1024\n \t}\n };\n \n@@ -472,6 +583,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_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_3,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 1,\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.direction               = TF_DIR_RX\n@@ -560,6 +679,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_PROF_FUNC,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_3,\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_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@@ -624,14 +751,6 @@ 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_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_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_INDEX_TABLE,\n \t.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,\n \t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_0,\n \t.direction               = TF_DIR_RX\n@@ -672,6 +791,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_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_3,\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_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@@ -760,6 +887,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_PROF_FUNC,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_3,\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_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@@ -824,14 +959,6 @@ 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_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_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_INDEX_TABLE,\n \t.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,\n \t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_0,\n \t.direction               = TF_DIR_RX\n@@ -843,509 +970,717 @@ struct bnxt_ulp_glb_resource_info ulp_app_glb_resource_tbl[] = {\n \t.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,\n \t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_1,\n \t.direction               = TF_DIR_RX\n-\t}\n-};\n-\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{\n-\t.app_id                  = 0,\n+\t.app_id                  = 4,\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_GLB_PROF_FUNC_ID,\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                  = 0,\n+\t.app_id                  = 4,\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_GLB_PROF_FUNC_ID,\n-\t.direction               = TF_DIR_TX\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_1,\n+\t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 0,\n+\t.app_id                  = 4,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\n-\t.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n-\t.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,\n-\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,\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.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_2,\n+\t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 0,\n+\t.app_id                  = 4,\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_L2_PROF_FUNC_ID,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_3,\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 0,\n+\t.app_id                  = 4,\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_L2_PROF_FUNC_ID,\n-\t.direction               = TF_DIR_TX\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-\t.app_id                  = 0,\n+\t.app_id                  = 4,\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_VXLAN_PROF_FUNC_ID,\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                  = 0,\n+\t.app_id                  = 4,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\n-\t.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n-\t.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,\n-\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,\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 \t},\n \t{\n-\t.app_id                  = 0,\n+\t.app_id                  = 4,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\n-\t.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n-\t.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,\n-\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,\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.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0,\n+\t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 0,\n+\t.app_id                  = 4,\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_EM_PROF,\n-\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_0,\n+\t.resource_type           = TF_IDENT_TYPE_WC_PROF,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_1,\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 0,\n+\t.app_id                  = 4,\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_GLB_WC_PROFILE_ID_0,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_2,\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 0,\n-\t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\n+\t.app_id                  = 4,\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_GLB_PROF_FUNC_ID,\n+\t.resource_type           = TF_IDENT_TYPE_WC_PROF,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_3,\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 0,\n-\t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\n+\t.app_id                  = 4,\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_GLB_PROF_FUNC_ID,\n-\t.direction               = TF_DIR_TX\n+\t.resource_type           = TF_IDENT_TYPE_WC_PROF,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_4,\n+\t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 0,\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_FULL_ACT_RECORD,\n-\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,\n-\t.direction               = TF_DIR_TX\n+\t.app_id                  = 4,\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_5,\n+\t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 0,\n-\t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\n+\t.app_id                  = 4,\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_L2_PROF_FUNC_ID,\n+\t.resource_type           = TF_IDENT_TYPE_WC_PROF,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_6,\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 0,\n-\t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\n+\t.app_id                  = 4,\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_L2_PROF_FUNC_ID,\n-\t.direction               = TF_DIR_TX\n+\t.resource_type           = TF_IDENT_TYPE_WC_PROF,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_7,\n+\t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 0,\n-\t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\n+\t.app_id                  = 4,\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_VXLAN_PROF_FUNC_ID,\n+\t.resource_type           = TF_IDENT_TYPE_WC_PROF,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_8,\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 0,\n-\t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\n+\t.app_id                  = 4,\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_GRE_PROF_FUNC_ID,\n+\t.resource_type           = TF_IDENT_TYPE_WC_PROF,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_9,\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 0,\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_ACT_ENCAP_16B,\n-\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,\n+\t.app_id                  = 4,\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_10,\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 0,\n-\t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\n+\t.app_id                  = 4,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\n \t.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n-\t.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,\n-\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,\n-\t.direction               = TF_DIR_TX\n+\t.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_0,\n+\t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 0,\n+\t.app_id                  = 4,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\n+\t.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n+\t.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_1,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 4,\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_GLB_EM_PROFILE_ID_0,\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                  = 0,\n+\t.app_id                  = 4,\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_WC_PROF,\n-\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0,\n+\t.resource_type           = TF_IDENT_TYPE_PROF_FUNC,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_1,\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 0,\n+\t.app_id                  = 4,\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_WC_PROF,\n-\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_1,\n+\t.resource_type           = TF_IDENT_TYPE_PROF_FUNC,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_2,\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 0,\n+\t.app_id                  = 4,\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_WC_PROF,\n-\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_2,\n+\t.resource_type           = TF_IDENT_TYPE_PROF_FUNC,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_3,\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 0,\n+\t.app_id                  = 4,\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_WC_PROF,\n-\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_3,\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-\t.app_id                  = 0,\n+\t.app_id                  = 4,\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                  = 4,\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+\t},\n+\t{\n+\t.app_id                  = 4,\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_WC_PROF,\n-\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_4,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0,\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 0,\n+\t.app_id                  = 4,\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_WC_PROF,\n-\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_5,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_1,\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 0,\n+\t.app_id                  = 4,\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_GLB_WC_KEY_ID_0,\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_2,\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 0,\n+\t.app_id                  = 4,\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_GLB_WC_KEY_ID_1,\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_3,\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 0,\n+\t.app_id                  = 4,\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_GLB_WC_KEY_ID_2,\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_4,\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 0,\n+\t.app_id                  = 4,\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_GLB_WC_KEY_ID_3,\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_5,\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 0,\n+\t.app_id                  = 4,\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_GLB_WC_KEY_ID_4,\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_6,\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 0,\n+\t.app_id                  = 4,\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_GLB_WC_KEY_ID_0,\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.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_7,\n+\t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 0,\n+\t.app_id                  = 4,\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_GLB_WC_KEY_ID_1,\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.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_8,\n+\t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 0,\n+\t.app_id                  = 4,\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_WC_PROF,\n-\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0,\n-\t.direction               = TF_DIR_TX\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_9,\n+\t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 0,\n+\t.app_id                  = 4,\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_WC_PROF,\n-\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_1,\n-\t.direction               = TF_DIR_TX\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_10,\n+\t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 0,\n+\t.app_id                  = 4,\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_EM_FKB,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_EM_KEY_ID_0,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 4,\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_GLB_WC_KEY_ID_1,\n-\t.direction               = TF_DIR_TX\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_0,\n+\t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 0,\n+\t.app_id                  = 4,\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_METADATA,\n-\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_METADATA_PROF_0,\n-\t.direction               = TF_DIR_TX\n+\t.resource_type           = TF_TBL_TYPE_WC_FKB,\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                  = 0,\n+\t.app_id                  = 4,\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_GLB_VFR_EM_PROF_ID_0,\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_2,\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 0,\n+\t.app_id                  = 4,\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_PROF_FUNC,\n-\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_VFR_PROF_FUNC_0,\n+\t.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n+\t.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_0,\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 0,\n+\t.app_id                  = 4,\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_EM_FKB,\n-\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_VFR_EM_KEY_ID_0,\n+\t.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_1,\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 5,\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_GLB_PROF_FUNC_ID,\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                  = 1,\n+\t.app_id                  = 5,\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_GLB_PROF_FUNC_ID,\n-\t.direction               = TF_DIR_TX\n-\t},\n-\t{\n-\t.app_id                  = 1,\n-\t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\n-\t.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n-\t.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,\n-\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,\n-\t.direction               = TF_DIR_TX\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_1,\n+\t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 5,\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_L2_PROF_FUNC_ID,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_2,\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 5,\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_L2_PROF_FUNC_ID,\n-\t.direction               = TF_DIR_TX\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_3,\n+\t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 5,\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_VXLAN_PROF_FUNC_ID,\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-\t.app_id                  = 1,\n+\t.app_id                  = 5,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\n-\t.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n-\t.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,\n-\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,\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.app_id                  = 5,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\n-\t.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n-\t.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,\n-\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,\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.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_EM_PROFILE_ID_0,\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.app_id                  = 5,\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_GLB_PROF_FUNC_ID,\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_RX\n \t},\n \t{\n-\t.app_id                  = 1,\n-\t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\n+\t.app_id                  = 5,\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_GLB_PROF_FUNC_ID,\n-\t.direction               = TF_DIR_TX\n+\t.resource_type           = TF_IDENT_TYPE_WC_PROF,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_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_INDEX_TABLE,\n-\t.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,\n-\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,\n-\t.direction               = TF_DIR_TX\n+\t.app_id                  = 5,\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_2,\n+\t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 5,\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_GLB_PROF_FUNC_ID,\n+\t.resource_type           = TF_IDENT_TYPE_WC_PROF,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_3,\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 5,\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_GLB_PROF_FUNC_ID,\n-\t.direction               = TF_DIR_TX\n+\t.resource_type           = TF_IDENT_TYPE_WC_PROF,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_4,\n+\t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 5,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\n-\t.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n-\t.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,\n-\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,\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.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_5,\n+\t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 5,\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_L2_PROF_FUNC_ID,\n+\t.resource_type           = TF_IDENT_TYPE_WC_PROF,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_6,\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 5,\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_L2_PROF_FUNC_ID,\n-\t.direction               = TF_DIR_TX\n+\t.resource_type           = TF_IDENT_TYPE_WC_PROF,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_7,\n+\t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 5,\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_VXLAN_PROF_FUNC_ID,\n+\t.resource_type           = TF_IDENT_TYPE_WC_PROF,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_8,\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 5,\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_9,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 5,\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_10,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 5,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\n \t.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n-\t.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,\n-\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,\n+\t.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_0,\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 5,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\n \t.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n-\t.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,\n-\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,\n-\t.direction               = TF_DIR_TX\n+\t.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_1,\n+\t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 5,\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_PROF_FUNC,\n-\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,\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.app_id                  = 5,\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_PROF_FUNC,\n-\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,\n-\t.direction               = TF_DIR_TX\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_1,\n+\t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 5,\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_PROF_FUNC,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_2,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 5,\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_PROF_FUNC,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_3,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 5,\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_0,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 5,\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                  = 5,\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+\t},\n+\t{\n+\t.app_id                  = 5,\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_WC_PROF,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 5,\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_WC_PROF,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_1,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 5,\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_WC_PROF,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_2,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 5,\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_WC_PROF,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_3,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 5,\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_WC_PROF,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_4,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 5,\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_WC_PROF,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_5,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 5,\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_WC_PROF,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_6,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 5,\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_WC_PROF,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_7,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 5,\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_WC_PROF,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_8,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 5,\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_WC_PROF,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_9,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 5,\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_WC_PROF,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_10,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 5,\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_EM_FKB,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_EM_KEY_ID_0,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 5,\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_RX\n+\t},\n+\t{\n+\t.app_id                  = 5,\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_1,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 5,\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_2,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 5,\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_FULL_ACT_RECORD,\n-\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,\n-\t.direction               = TF_DIR_TX\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_0,\n+\t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 5,\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_FULL_ACT_RECORD,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_1,\n+\t.direction               = TF_DIR_RX\n+\t}\n+};\n+\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 \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@@ -1353,7 +1688,7 @@ struct bnxt_ulp_glb_resource_info ulp_glb_resource_tbl[] = {\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 0,\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@@ -1361,7 +1696,7 @@ struct bnxt_ulp_glb_resource_info ulp_glb_resource_tbl[] = {\n \t.direction               = TF_DIR_TX\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 0,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\n \t.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,\n@@ -1369,7 +1704,7 @@ struct bnxt_ulp_glb_resource_info ulp_glb_resource_tbl[] = {\n \t.direction               = TF_DIR_TX\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 0,\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@@ -1377,7 +1712,7 @@ struct bnxt_ulp_glb_resource_info ulp_glb_resource_tbl[] = {\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 0,\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@@ -1385,7 +1720,7 @@ struct bnxt_ulp_glb_resource_info ulp_glb_resource_tbl[] = {\n \t.direction               = TF_DIR_TX\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 0,\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@@ -1393,7 +1728,7 @@ struct bnxt_ulp_glb_resource_info ulp_glb_resource_tbl[] = {\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 0,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\n \t.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,\n@@ -1401,7 +1736,7 @@ struct bnxt_ulp_glb_resource_info ulp_glb_resource_tbl[] = {\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 0,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\n \t.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n \t.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,\n@@ -1409,7 +1744,7 @@ struct bnxt_ulp_glb_resource_info ulp_glb_resource_tbl[] = {\n \t.direction               = TF_DIR_TX\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 0,\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_EM_PROF,\n@@ -1417,7 +1752,7 @@ struct bnxt_ulp_glb_resource_info ulp_glb_resource_tbl[] = {\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 0,\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@@ -1425,7 +1760,7 @@ struct bnxt_ulp_glb_resource_info ulp_glb_resource_tbl[] = {\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 0,\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_PROF_FUNC,\n@@ -1433,7 +1768,7 @@ struct bnxt_ulp_glb_resource_info ulp_glb_resource_tbl[] = {\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 0,\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_PROF_FUNC,\n@@ -1441,7 +1776,7 @@ struct bnxt_ulp_glb_resource_info ulp_glb_resource_tbl[] = {\n \t.direction               = TF_DIR_TX\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 0,\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_FULL_ACT_RECORD,\n@@ -1449,7 +1784,7 @@ struct bnxt_ulp_glb_resource_info ulp_glb_resource_tbl[] = {\n \t.direction               = TF_DIR_TX\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 0,\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_PROF_FUNC,\n@@ -1457,7 +1792,7 @@ struct bnxt_ulp_glb_resource_info ulp_glb_resource_tbl[] = {\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 0,\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_PROF_FUNC,\n@@ -1465,7 +1800,7 @@ struct bnxt_ulp_glb_resource_info ulp_glb_resource_tbl[] = {\n \t.direction               = TF_DIR_TX\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 0,\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_PROF_FUNC,\n@@ -1473,7 +1808,7 @@ struct bnxt_ulp_glb_resource_info ulp_glb_resource_tbl[] = {\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 0,\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_PROF_FUNC,\n@@ -1481,7 +1816,7 @@ struct bnxt_ulp_glb_resource_info ulp_glb_resource_tbl[] = {\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 0,\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_ACT_ENCAP_16B,\n@@ -1489,7 +1824,7 @@ struct bnxt_ulp_glb_resource_info ulp_glb_resource_tbl[] = {\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 0,\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_ACT_ENCAP_16B,\n@@ -1497,7 +1832,15 @@ struct bnxt_ulp_glb_resource_info ulp_glb_resource_tbl[] = {\n \t.direction               = TF_DIR_TX\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 0,\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_GLB_EM_PROFILE_ID_0,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 0,\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_WC_PROF,\n@@ -1505,7 +1848,7 @@ struct bnxt_ulp_glb_resource_info ulp_glb_resource_tbl[] = {\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 0,\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_WC_PROF,\n@@ -1513,7 +1856,7 @@ struct bnxt_ulp_glb_resource_info ulp_glb_resource_tbl[] = {\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 0,\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_WC_PROF,\n@@ -1521,7 +1864,7 @@ struct bnxt_ulp_glb_resource_info ulp_glb_resource_tbl[] = {\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 0,\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_WC_PROF,\n@@ -1529,7 +1872,7 @@ struct bnxt_ulp_glb_resource_info ulp_glb_resource_tbl[] = {\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 0,\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_WC_PROF,\n@@ -1537,7 +1880,7 @@ struct bnxt_ulp_glb_resource_info ulp_glb_resource_tbl[] = {\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 0,\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_WC_PROF,\n@@ -1545,23 +1888,7 @@ struct bnxt_ulp_glb_resource_info ulp_glb_resource_tbl[] = {\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 3,\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_WC_PROF,\n-\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_6,\n-\t.direction               = TF_DIR_RX\n-\t},\n-\t{\n-\t.app_id                  = 3,\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_WC_PROF,\n-\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_7,\n-\t.direction               = TF_DIR_RX\n-\t},\n-\t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 0,\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@@ -1569,7 +1896,7 @@ struct bnxt_ulp_glb_resource_info ulp_glb_resource_tbl[] = {\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 0,\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@@ -1577,7 +1904,7 @@ struct bnxt_ulp_glb_resource_info ulp_glb_resource_tbl[] = {\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 0,\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@@ -1585,7 +1912,7 @@ struct bnxt_ulp_glb_resource_info ulp_glb_resource_tbl[] = {\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 0,\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@@ -1593,7 +1920,7 @@ struct bnxt_ulp_glb_resource_info ulp_glb_resource_tbl[] = {\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 0,\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@@ -1601,7 +1928,7 @@ struct bnxt_ulp_glb_resource_info ulp_glb_resource_tbl[] = {\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 0,\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@@ -1609,7 +1936,7 @@ struct bnxt_ulp_glb_resource_info ulp_glb_resource_tbl[] = {\n \t.direction               = TF_DIR_TX\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 0,\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@@ -1617,7 +1944,7 @@ struct bnxt_ulp_glb_resource_info ulp_glb_resource_tbl[] = {\n \t.direction               = TF_DIR_TX\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 0,\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_WC_PROF,\n@@ -1625,7 +1952,7 @@ struct bnxt_ulp_glb_resource_info ulp_glb_resource_tbl[] = {\n \t.direction               = TF_DIR_TX\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 0,\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_WC_PROF,\n@@ -1633,427 +1960,2171 @@ struct bnxt_ulp_glb_resource_info ulp_glb_resource_tbl[] = {\n \t.direction               = TF_DIR_TX\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 0,\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_GLB_WC_KEY_ID_1,\n+\t.direction               = TF_DIR_TX\n+\t},\n+\t{\n+\t.app_id                  = 0,\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_METADATA,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_METADATA_PROF_0,\n+\t.direction               = TF_DIR_TX\n+\t},\n+\t{\n+\t.app_id                  = 0,\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_GLB_EM_PROFILE_ID_0,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_VFR_EM_PROF_ID_0,\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 0,\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_GLB_EM_PROFILE_ID_1,\n+\t.resource_type           = TF_IDENT_TYPE_PROF_FUNC,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_VFR_PROF_FUNC_0,\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 0,\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_EM_FKB,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_VFR_EM_KEY_ID_0,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 1,\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_EM_PROF,\n-\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_2,\n+\t.resource_type           = TF_IDENT_TYPE_PROF_FUNC,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 3,\n-\t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\n+\t.app_id                  = 1,\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_EM_PROF,\n-\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_3,\n+\t.resource_type           = TF_IDENT_TYPE_PROF_FUNC,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,\n+\t.direction               = TF_DIR_TX\n+\t},\n+\t{\n+\t.app_id                  = 1,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\n+\t.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n+\t.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,\n+\t.direction               = TF_DIR_TX\n+\t},\n+\t{\n+\t.app_id                  = 1,\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_L2_PROF_FUNC_ID,\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 1,\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_L2_PROF_FUNC_ID,\n+\t.direction               = TF_DIR_TX\n+\t},\n+\t{\n+\t.app_id                  = 1,\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_VXLAN_PROF_FUNC_ID,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 1,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\n+\t.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n+\t.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 1,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\n+\t.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n+\t.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,\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_GLB_EM_PROFILE_ID_4,\n+\t.resource_type           = TF_IDENT_TYPE_PROF_FUNC,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 3,\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_GLB_EM_PROFILE_ID_5,\n+\t.resource_type           = TF_IDENT_TYPE_PROF_FUNC,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,\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_INDEX_TABLE,\n+\t.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,\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_PROF_FUNC,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 3,\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_GLB_PROF_FUNC_ID,\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_INDEX_TABLE,\n+\t.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,\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_PROF_FUNC,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,\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_L2_PROF_FUNC_ID,\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_PROF_FUNC,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_VXLAN_PROF_FUNC_ID,\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_INDEX_TABLE,\n+\t.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,\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_INDEX_TABLE,\n+\t.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,\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_GLB_EM_PROFILE_ID_6,\n+\t.resource_type           = TF_IDENT_TYPE_PROF_FUNC,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 3,\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_GLB_EM_PROFILE_ID_7,\n+\t.resource_type           = TF_IDENT_TYPE_PROF_FUNC,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,\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_INDEX_TABLE,\n+\t.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,\n+\t.direction               = TF_DIR_TX\n+\t},\n+\t{\n+\t.app_id                  = 3,\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_GLB_PROF_FUNC_ID,\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n \t.app_id                  = 3,\n-\t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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_GLB_PROF_FUNC_ID,\n+\t.direction               = TF_DIR_TX\n+\t},\n+\t{\n+\t.app_id                  = 3,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\n \t.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n-\t.resource_type           = TF_TBL_TYPE_EM_FKB,\n-\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_KEY_ID_0,\n+\t.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,\n+\t.direction               = TF_DIR_TX\n+\t},\n+\t{\n+\t.app_id                  = 3,\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_L2_PROF_FUNC_ID,\n \t.direction               = TF_DIR_RX\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 3,\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_L2_PROF_FUNC_ID,\n+\t.direction               = TF_DIR_TX\n+\t},\n+\t{\n+\t.app_id                  = 3,\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_VXLAN_PROF_FUNC_ID,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 3,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\n+\t.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n+\t.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 3,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\n+\t.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n+\t.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,\n+\t.direction               = TF_DIR_TX\n+\t},\n+\t{\n+\t.app_id                  = 3,\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_EM_PROF,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_0,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 3,\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_GLB_WC_PROFILE_ID_0,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 3,\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_PROF_FUNC,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 3,\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_PROF_FUNC,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,\n+\t.direction               = TF_DIR_TX\n+\t},\n+\t{\n+\t.app_id                  = 3,\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_FULL_ACT_RECORD,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,\n+\t.direction               = TF_DIR_TX\n+\t},\n+\t{\n+\t.app_id                  = 3,\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_PROF_FUNC,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 3,\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_PROF_FUNC,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,\n+\t.direction               = TF_DIR_TX\n+\t},\n+\t{\n+\t.app_id                  = 3,\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_PROF_FUNC,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_VXLAN_PROF_FUNC_ID,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 3,\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_PROF_FUNC,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GRE_PROF_FUNC_ID,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 3,\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_ACT_ENCAP_16B,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 3,\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_ACT_ENCAP_16B,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,\n+\t.direction               = TF_DIR_TX\n+\t},\n+\t{\n+\t.app_id                  = 3,\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_WC_PROF,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 3,\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_WC_PROF,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_1,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 3,\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_WC_PROF,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_2,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 3,\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_WC_PROF,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_3,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 3,\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_WC_PROF,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_4,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 3,\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_WC_PROF,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_5,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 3,\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_WC_PROF,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_6,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 3,\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_WC_PROF,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_7,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 3,\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_GLB_WC_KEY_ID_0,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 3,\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_GLB_WC_KEY_ID_1,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 3,\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_GLB_WC_KEY_ID_2,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 3,\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_GLB_WC_KEY_ID_3,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 3,\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_GLB_WC_KEY_ID_4,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 3,\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_GLB_WC_KEY_ID_0,\n+\t.direction               = TF_DIR_TX\n+\t},\n+\t{\n+\t.app_id                  = 3,\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_GLB_WC_KEY_ID_1,\n+\t.direction               = TF_DIR_TX\n+\t},\n+\t{\n+\t.app_id                  = 3,\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_WC_PROF,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0,\n+\t.direction               = TF_DIR_TX\n+\t},\n+\t{\n+\t.app_id                  = 3,\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_WC_PROF,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_1,\n+\t.direction               = TF_DIR_TX\n+\t},\n+\t{\n+\t.app_id                  = 3,\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_GLB_EM_PROFILE_ID_0,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 3,\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_GLB_EM_PROFILE_ID_1,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 3,\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_GLB_EM_PROFILE_ID_2,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 3,\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_GLB_EM_PROFILE_ID_3,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 3,\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_GLB_EM_PROFILE_ID_4,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 3,\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_GLB_EM_PROFILE_ID_5,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 3,\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_GLB_EM_PROFILE_ID_6,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 3,\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_GLB_EM_PROFILE_ID_7,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 3,\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_EM_FKB,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_KEY_ID_0,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 3,\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_EM_FKB,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_KEY_ID_1,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 3,\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_EM_FKB,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_KEY_ID_2,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 3,\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_EM_FKB,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_KEY_ID_3,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 4,\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_GLB_PROF_FUNC_ID,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 4,\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_GLB_PROF_FUNC_ID,\n+\t.direction               = TF_DIR_TX\n+\t},\n+\t{\n+\t.app_id                  = 4,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\n+\t.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n+\t.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,\n+\t.direction               = TF_DIR_TX\n+\t},\n+\t{\n+\t.app_id                  = 4,\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_L2_PROF_FUNC_ID,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 4,\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_L2_PROF_FUNC_ID,\n+\t.direction               = TF_DIR_TX\n+\t},\n+\t{\n+\t.app_id                  = 4,\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_VXLAN_PROF_FUNC_ID,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 4,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\n+\t.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n+\t.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 4,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\n+\t.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n+\t.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,\n+\t.direction               = TF_DIR_TX\n+\t},\n+\t{\n+\t.app_id                  = 4,\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_PROF_FUNC,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 4,\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_PROF_FUNC,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,\n+\t.direction               = TF_DIR_TX\n+\t},\n+\t{\n+\t.app_id                  = 4,\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_FULL_ACT_RECORD,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,\n+\t.direction               = TF_DIR_TX\n+\t},\n+\t{\n+\t.app_id                  = 5,\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_GLB_PROF_FUNC_ID,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 5,\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_GLB_PROF_FUNC_ID,\n+\t.direction               = TF_DIR_TX\n+\t},\n+\t{\n+\t.app_id                  = 5,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\n+\t.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n+\t.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,\n+\t.direction               = TF_DIR_TX\n+\t},\n+\t{\n+\t.app_id                  = 5,\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_L2_PROF_FUNC_ID,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 5,\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_L2_PROF_FUNC_ID,\n+\t.direction               = TF_DIR_TX\n+\t},\n+\t{\n+\t.app_id                  = 5,\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_VXLAN_PROF_FUNC_ID,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 5,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\n+\t.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n+\t.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 5,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\n+\t.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,\n+\t.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,\n+\t.direction               = TF_DIR_TX\n+\t},\n+\t{\n+\t.app_id                  = 5,\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_PROF_FUNC,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,\n+\t.direction               = TF_DIR_RX\n+\t},\n+\t{\n+\t.app_id                  = 5,\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_PROF_FUNC,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,\n+\t.direction               = TF_DIR_TX\n+\t},\n+\t{\n+\t.app_id                  = 5,\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_FULL_ACT_RECORD,\n+\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,\n+\t.direction               = TF_DIR_TX\n+\t}\n+};\n+\n+/* List of tf resources required to be reserved per app/device */\n+struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n+\t{\n+\t.app_id                  = 0,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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},\n+\t{\n+\t.app_id                  = 0,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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},\n+\t{\n+\t.app_id                  = 0,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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                   = 191\n+\t},\n+\t{\n+\t.app_id                  = 0,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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                   = 63\n+\t},\n+\t{\n+\t.app_id                  = 0,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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},\n+\t{\n+\t.app_id                  = 0,\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_FULL_ACT_RECORD,\n+\t.count                   = 8192\n+\t},\n+\t{\n+\t.app_id                  = 0,\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_ACT_STATS_64,\n+\t.count                   = 6912\n+\t},\n+\t{\n+\t.app_id                  = 0,\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_ACT_MODIFY_IPV4,\n+\t.count                   = 1023\n+\t},\n+\t{\n+\t.app_id                  = 0,\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_ACT_ENCAP_8B,\n+\t.count                   = 511\n+\t},\n+\t{\n+\t.app_id                  = 0,\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_ACT_ENCAP_16B,\n+\t.count                   = 15\n+\t},\n+\t{\n+\t.app_id                  = 0,\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_ACT_SP_SMAC,\n+\t.count                   = 255\n+\t},\n+\t{\n+\t.app_id                  = 0,\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},\n+\t{\n+\t.app_id                  = 0,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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},\n+\t{\n+\t.app_id                  = 0,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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},\n+\t{\n+\t.app_id                  = 0,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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},\n+\t{\n+\t.app_id                  = 0,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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},\n+\t{\n+\t.app_id                  = 0,\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_EM_RECORD,\n+\t.count                   = 13168\n+\t},\n+\t{\n+\t.app_id                  = 0,\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},\n+\t{\n+\t.app_id                  = 0,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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},\n+\t{\n+\t.app_id                  = 0,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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},\n+\t{\n+\t.app_id                  = 0,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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                   = 191\n+\t},\n+\t{\n+\t.app_id                  = 0,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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},\n+\t{\n+\t.app_id                  = 0,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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},\n+\t{\n+\t.app_id                  = 0,\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_FULL_ACT_RECORD,\n+\t.count                   = 8192\n+\t},\n+\t{\n+\t.app_id                  = 0,\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_ACT_STATS_64,\n+\t.count                   = 6912\n+\t},\n+\t{\n+\t.app_id                  = 0,\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_ACT_MODIFY_IPV4,\n+\t.count                   = 1023\n+\t},\n+\t{\n+\t.app_id                  = 0,\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_ACT_ENCAP_64B,\n+\t.count                   = 511\n+\t},\n+\t{\n+\t.app_id                  = 0,\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_ACT_ENCAP_16B,\n+\t.count                   = 223\n+\t},\n+\t{\n+\t.app_id                  = 0,\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_ACT_ENCAP_8B,\n+\t.count                   = 255\n+\t},\n+\t{\n+\t.app_id                  = 0,\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_ACT_SP_SMAC_IPV4,\n+\t.count                   = 488\n+\t},\n+\t{\n+\t.app_id                  = 0,\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_ACT_SP_SMAC_IPV6,\n+\t.count                   = 511\n+\t},\n+\t{\n+\t.app_id                  = 0,\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},\n+\t{\n+\t.app_id                  = 0,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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},\n+\t{\n+\t.app_id                  = 0,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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},\n+\t{\n+\t.app_id                  = 0,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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},\n+\t{\n+\t.app_id                  = 0,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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},\n+\t{\n+\t.app_id                  = 0,\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_EM_RECORD,\n+\t.count                   = 15232\n+\t},\n+\t{\n+\t.app_id                  = 0,\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},\n+\t{\n+\t.app_id                  = 0,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 272\n+\t},\n+\t{\n+\t.app_id                  = 0,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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},\n+\t{\n+\t.app_id                  = 0,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 32\n+\t},\n+\t{\n+\t.app_id                  = 0,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 32\n+\t},\n+\t{\n+\t.app_id                  = 0,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 32\n+\t},\n+\t{\n+\t.app_id                  = 0,\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_FULL_ACT_RECORD,\n+\t.count                   = 8192\n+\t},\n+\t{\n+\t.app_id                  = 0,\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                   = 8192\n+\t},\n+\t{\n+\t.app_id                  = 0,\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                   = 5\n+\t},\n+\t{\n+\t.app_id                  = 0,\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_EM_FKB,\n+\t.count                   = 32\n+\t},\n+\t{\n+\t.app_id                  = 0,\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_WC_FKB,\n+\t.count                   = 31\n+\t},\n+\t{\n+\t.app_id                  = 0,\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_ENCAP_64B,\n+\t.count                   = 2048\n+\t},\n+\t{\n+\t.app_id                  = 0,\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_SP_SMAC_IPV4,\n+\t.count                   = 64\n+\t},\n+\t{\n+\t.app_id                  = 0,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 272\n+\t},\n+\t{\n+\t.app_id                  = 0,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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},\n+\t{\n+\t.app_id                  = 0,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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},\n+\t{\n+\t.app_id                  = 0,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 4096\n+\t},\n+\t{\n+\t.app_id                  = 0,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 16384\n+\t},\n+\t{\n+\t.app_id                  = 0,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 272\n+\t},\n+\t{\n+\t.app_id                  = 0,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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},\n+\t{\n+\t.app_id                  = 0,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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},\n+\t{\n+\t.app_id                  = 0,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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},\n+\t{\n+\t.app_id                  = 0,\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_FULL_ACT_RECORD,\n+\t.count                   = 8192\n+\t},\n+\t{\n+\t.app_id                  = 0,\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                   = 8192\n+\t},\n+\t{\n+\t.app_id                  = 0,\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                   = 5\n+\t},\n+\t{\n+\t.app_id                  = 0,\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_EM_FKB,\n+\t.count                   = 32\n+\t},\n+\t{\n+\t.app_id                  = 0,\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_WC_FKB,\n+\t.count                   = 32\n+\t},\n+\t{\n+\t.app_id                  = 0,\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_ENCAP_64B,\n+\t.count                   = 2048\n+\t},\n+\t{\n+\t.app_id                  = 0,\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_SP_SMAC_IPV4,\n+\t.count                   = 100\n+\t},\n+\t{\n+\t.app_id                  = 0,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 272\n+\t},\n+\t{\n+\t.app_id                  = 0,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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},\n+\t{\n+\t.app_id                  = 0,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 4096\n+\t},\n+\t{\n+\t.app_id                  = 0,\n+\t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 16384\n+\t},\n+\t{\n+\t.app_id                  = 0,\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_METADATA,\n+\t.count                   = 1\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_IDENTIFIER,\n+\t.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,\n+\t.count                   = 32\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_IDENTIFIER,\n+\t.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,\n+\t.count                   = 2\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_IDENTIFIER,\n+\t.resource_type           = TF_IDENT_TYPE_WC_PROF,\n+\t.count                   = 4\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_IDENTIFIER,\n+\t.resource_type           = TF_IDENT_TYPE_PROF_FUNC,\n+\t.count                   = 4\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_IDENTIFIER,\n+\t.resource_type           = TF_IDENT_TYPE_EM_PROF,\n+\t.count                   = 4\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_FULL_ACT_RECORD,\n+\t.count                   = 128\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_ACT_STATS_64,\n+\t.count                   = 128\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_ACT_MODIFY_IPV4,\n+\t.count                   = 4\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_ACT_ENCAP_8B,\n+\t.count                   = 4\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_ACT_ENCAP_16B,\n+\t.count                   = 4\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_ACT_SP_SMAC,\n+\t.count                   = 4\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_TCAM_TABLE,\n+\t.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\n+\t.count                   = 32\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_TCAM_TABLE,\n+\t.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,\n+\t.count                   = 2\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_TCAM_TABLE,\n+\t.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,\n+\t.count                   = 32\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_TCAM_TABLE,\n+\t.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,\n+\t.count                   = 4\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_EM_RECORD,\n+\t.count                   = 1024\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_IDENTIFIER,\n+\t.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,\n+\t.count                   = 32\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_IDENTIFIER,\n+\t.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,\n+\t.count                   = 2\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_IDENTIFIER,\n+\t.resource_type           = TF_IDENT_TYPE_WC_PROF,\n+\t.count                   = 4\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_IDENTIFIER,\n+\t.resource_type           = TF_IDENT_TYPE_PROF_FUNC,\n+\t.count                   = 4\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_IDENTIFIER,\n+\t.resource_type           = TF_IDENT_TYPE_EM_PROF,\n+\t.count                   = 4\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_FULL_ACT_RECORD,\n+\t.count                   = 128\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_ACT_STATS_64,\n+\t.count                   = 128\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_ACT_MODIFY_IPV4,\n+\t.count                   = 4\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_ACT_ENCAP_64B,\n+\t.count                   = 4\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_ACT_ENCAP_16B,\n+\t.count                   = 4\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_ACT_ENCAP_8B,\n+\t.count                   = 4\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_ACT_SP_SMAC_IPV4,\n+\t.count                   = 4\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_ACT_SP_SMAC_IPV6,\n+\t.count                   = 4\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_TCAM_TABLE,\n+\t.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\n+\t.count                   = 32\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_TCAM_TABLE,\n+\t.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,\n+\t.count                   = 2\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_TCAM_TABLE,\n+\t.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,\n+\t.count                   = 32\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_TCAM_TABLE,\n+\t.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,\n+\t.count                   = 4\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_EM_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_IDENTIFIER,\n+\t.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,\n+\t.count                   = 32\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_IDENTIFIER,\n+\t.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,\n+\t.count                   = 2\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_IDENTIFIER,\n+\t.resource_type           = TF_IDENT_TYPE_WC_PROF,\n+\t.count                   = 32\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_IDENTIFIER,\n+\t.resource_type           = TF_IDENT_TYPE_PROF_FUNC,\n+\t.count                   = 16\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_IDENTIFIER,\n+\t.resource_type           = TF_IDENT_TYPE_EM_PROF,\n+\t.count                   = 32\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_FULL_ACT_RECORD,\n+\t.count                   = 528\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                   = 256\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_EM_FKB,\n+\t.count                   = 4\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_WC_FKB,\n+\t.count                   = 4\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_ENCAP_64B,\n+\t.count                   = 4\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_SP_SMAC_IPV4,\n+\t.count                   = 4\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_TCAM_TABLE,\n+\t.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\n+\t.count                   = 32\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_TCAM_TABLE,\n+\t.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,\n+\t.count                   = 2\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_TCAM_TABLE,\n+\t.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,\n+\t.count                   = 32\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_TCAM_TABLE,\n+\t.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,\n+\t.count                   = 4\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_EM_TABLE,\n+\t.resource_type           = TF_EM_TBL_TYPE_EM_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_IDENTIFIER,\n+\t.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,\n+\t.count                   = 32\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_IDENTIFIER,\n+\t.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,\n+\t.count                   = 2\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_IDENTIFIER,\n+\t.resource_type           = TF_IDENT_TYPE_WC_PROF,\n+\t.count                   = 4\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_IDENTIFIER,\n+\t.resource_type           = TF_IDENT_TYPE_PROF_FUNC,\n+\t.count                   = 4\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_IDENTIFIER,\n+\t.resource_type           = TF_IDENT_TYPE_EM_PROF,\n+\t.count                   = 4\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_FULL_ACT_RECORD,\n+\t.count                   = 512\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                   = 256\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_EM_FKB,\n+\t.count                   = 4\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_WC_FKB,\n+\t.count                   = 4\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_ENCAP_64B,\n+\t.count                   = 4\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_SP_SMAC_IPV4,\n+\t.count                   = 4\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_TCAM_TABLE,\n+\t.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\n+\t.count                   = 32\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_TCAM_TABLE,\n+\t.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,\n+\t.count                   = 2\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_INDEX_TABLE,\n-\t.resource_type           = TF_TBL_TYPE_EM_FKB,\n-\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_KEY_ID_1,\n-\t.direction               = TF_DIR_RX\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                   = 32\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 1,\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_EM_FKB,\n-\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_KEY_ID_2,\n-\t.direction               = TF_DIR_RX\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                   = 4\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 1,\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_EM_FKB,\n-\t.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_KEY_ID_3,\n-\t.direction               = TF_DIR_RX\n-\t}\n-};\n-\n-/* List of tf resources required to be reserved per app/device */\n-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                   = 1024\n+\t},\n \t{\n-\t.app_id                  = 0,\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_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                  = 0,\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_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                  = 0,\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_IDENTIFIER,\n \t.resource_type           = TF_IDENT_TYPE_WC_PROF,\n-\t.count                   = 191\n+\t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 0,\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_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                  = 0,\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_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                  = 0,\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_FULL_ACT_RECORD,\n-\t.count                   = 8192\n+\t.count                   = 128\n \t},\n \t{\n-\t.app_id                  = 0,\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_ACT_STATS_64,\n-\t.count                   = 6912\n+\t.count                   = 128\n \t},\n \t{\n-\t.app_id                  = 0,\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_ACT_MODIFY_IPV4,\n-\t.count                   = 1023\n+\t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 0,\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_ACT_ENCAP_8B,\n-\t.count                   = 511\n+\t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 0,\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_ACT_ENCAP_16B,\n-\t.count                   = 15\n+\t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 0,\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_ACT_SP_SMAC,\n-\t.count                   = 255\n-\t},\n-\t{\n-\t.app_id                  = 0,\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                  = 0,\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_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                  = 0,\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_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                  = 0,\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_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                  = 0,\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_TCAM_TABLE,\n \t.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,\n-\t.count                   = 88\n+\t.count                   = 64\n \t},\n \t{\n-\t.app_id                  = 0,\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_EM_RECORD,\n-\t.count                   = 13168\n-\t},\n-\t{\n-\t.app_id                  = 0,\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                  = 0,\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_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                  = 0,\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_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                  = 0,\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_IDENTIFIER,\n \t.resource_type           = TF_IDENT_TYPE_WC_PROF,\n-\t.count                   = 191\n+\t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 0,\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_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                  = 0,\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_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                  = 0,\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_FULL_ACT_RECORD,\n-\t.count                   = 8192\n+\t.count                   = 128\n \t},\n \t{\n-\t.app_id                  = 0,\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_ACT_STATS_64,\n-\t.count                   = 6912\n+\t.count                   = 128\n \t},\n \t{\n-\t.app_id                  = 0,\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_ACT_MODIFY_IPV4,\n-\t.count                   = 1023\n+\t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 0,\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_ACT_ENCAP_64B,\n-\t.count                   = 511\n+\t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 0,\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_ACT_ENCAP_16B,\n-\t.count                   = 223\n+\t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 0,\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_ACT_ENCAP_8B,\n-\t.count                   = 255\n+\t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 0,\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_ACT_SP_SMAC_IPV4,\n-\t.count                   = 488\n+\t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 0,\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_ACT_SP_SMAC_IPV6,\n-\t.count                   = 511\n-\t},\n-\t{\n-\t.app_id                  = 0,\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                  = 0,\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_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                  = 0,\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_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                  = 0,\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_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                  = 0,\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_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                  = 0,\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_EM_RECORD,\n-\t.count                   = 15232\n-\t},\n-\t{\n-\t.app_id                  = 0,\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                  = 0,\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_IDENTIFIER,\n \t.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,\n-\t.count                   = 272\n+\t.count                   = 32\n \t},\n \t{\n-\t.app_id                  = 0,\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_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                  = 0,\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_IDENTIFIER,\n@@ -2061,15 +4132,15 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 32\n \t},\n \t{\n-\t.app_id                  = 0,\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_IDENTIFIER,\n \t.resource_type           = TF_IDENT_TYPE_PROF_FUNC,\n-\t.count                   = 32\n+\t.count                   = 16\n \t},\n \t{\n-\t.app_id                  = 0,\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_IDENTIFIER,\n@@ -2077,759 +4148,815 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 32\n \t},\n \t{\n-\t.app_id                  = 0,\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_FULL_ACT_RECORD,\n-\t.count                   = 8192\n+\t.count                   = 528\n \t},\n \t{\n-\t.app_id                  = 0,\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                   = 8192\n-\t},\n-\t{\n-\t.app_id                  = 0,\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                   = 5\n+\t.count                   = 256\n \t},\n \t{\n-\t.app_id                  = 0,\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_EM_FKB,\n-\t.count                   = 32\n+\t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 0,\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_WC_FKB,\n-\t.count                   = 31\n+\t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 0,\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_ENCAP_64B,\n-\t.count                   = 2048\n+\t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 0,\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_SP_SMAC_IPV4,\n-\t.count                   = 64\n+\t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 0,\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_TCAM_TABLE,\n \t.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\n-\t.count                   = 272\n+\t.count                   = 32\n \t},\n \t{\n-\t.app_id                  = 0,\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_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                  = 0,\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_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                  = 0,\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_TCAM_TABLE,\n \t.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,\n-\t.count                   = 4096\n+\t.count                   = 512\n \t},\n \t{\n-\t.app_id                  = 0,\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_EM_TABLE,\n \t.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,\n-\t.count                   = 16384\n+\t.count                   = 1024\n \t},\n \t{\n-\t.app_id                  = 0,\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_IDENTIFIER,\n+\t.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,\n+\t.count                   = 32\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_IDENTIFIER,\n \t.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,\n-\t.count                   = 272\n+\t.count                   = 2\n \t},\n \t{\n-\t.app_id                  = 0,\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_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                  = 0,\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_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                  = 0,\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_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                  = 0,\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_FULL_ACT_RECORD,\n-\t.count                   = 8192\n+\t.count                   = 512\n \t},\n \t{\n-\t.app_id                  = 0,\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                   = 8192\n-\t},\n-\t{\n-\t.app_id                  = 0,\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                   = 5\n+\t.count                   = 256\n \t},\n \t{\n-\t.app_id                  = 0,\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_EM_FKB,\n-\t.count                   = 32\n+\t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 0,\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_WC_FKB,\n-\t.count                   = 32\n+\t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 0,\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_ENCAP_64B,\n-\t.count                   = 2048\n+\t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 0,\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_SP_SMAC_IPV4,\n-\t.count                   = 100\n+\t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 0,\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_TCAM_TABLE,\n+\t.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,\n+\t.count                   = 32\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_TCAM_TABLE,\n \t.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,\n-\t.count                   = 272\n+\t.count                   = 2\n \t},\n \t{\n-\t.app_id                  = 0,\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_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                  = 0,\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_TCAM_TABLE,\n \t.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,\n-\t.count                   = 4096\n+\t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 0,\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_EM_TABLE,\n \t.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,\n-\t.count                   = 16384\n-\t},\n-\t{\n-\t.app_id                  = 0,\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_METADATA,\n-\t.count                   = 1\n+\t.count                   = 1024\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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                   = 32\n+\t.count                   = 422\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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                   = 2\n+\t.count                   = 6\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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                   = 4\n+\t.count                   = 191\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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                   = 4\n+\t.count                   = 63\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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                   = 4\n+\t.count                   = 192\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\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_FULL_ACT_RECORD,\n-\t.count                   = 128\n+\t.count                   = 8192\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\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_ACT_STATS_64,\n-\t.count                   = 128\n+\t.count                   = 7168\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\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_ACT_MODIFY_IPV4,\n-\t.count                   = 4\n+\t.count                   = 1023\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\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_ACT_ENCAP_8B,\n-\t.count                   = 4\n+\t.count                   = 511\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\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_ACT_ENCAP_16B,\n-\t.count                   = 4\n+\t.count                   = 15\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\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_ACT_SP_SMAC,\n-\t.count                   = 4\n+\t.count                   = 255\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\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},\n+\t{\n+\t.app_id                  = 3,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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                   = 32\n+\t.count                   = 422\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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                   = 2\n+\t.count                   = 6\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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                   = 32\n+\t.count                   = 960\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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                   = 4\n+\t.count                   = 88\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\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_EM_RECORD,\n-\t.count                   = 1024\n+\t.count                   = 13168\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\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},\n+\t{\n+\t.app_id                  = 3,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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                   = 32\n+\t.count                   = 292\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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                   = 2\n+\t.count                   = 148\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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                   = 4\n+\t.count                   = 191\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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                   = 4\n+\t.count                   = 63\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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                   = 4\n+\t.count                   = 192\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\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_FULL_ACT_RECORD,\n-\t.count                   = 128\n+\t.count                   = 8192\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\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_ACT_STATS_64,\n-\t.count                   = 128\n+\t.count                   = 7168\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\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_ACT_MODIFY_IPV4,\n-\t.count                   = 4\n+\t.count                   = 1023\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\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_ACT_ENCAP_64B,\n-\t.count                   = 4\n+\t.count                   = 511\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\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_ACT_ENCAP_16B,\n-\t.count                   = 4\n+\t.count                   = 223\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\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_ACT_ENCAP_8B,\n-\t.count                   = 4\n+\t.count                   = 255\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\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_ACT_SP_SMAC_IPV4,\n-\t.count                   = 4\n+\t.count                   = 488\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\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_ACT_SP_SMAC_IPV6,\n-\t.count                   = 4\n+\t.count                   = 511\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\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},\n+\t{\n+\t.app_id                  = 3,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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                   = 32\n+\t.count                   = 292\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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                   = 2\n+\t.count                   = 144\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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                   = 32\n+\t.count                   = 960\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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                   = 4\n+\t.count                   = 928\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\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_EM_RECORD,\n-\t.count                   = 1024\n+\t.count                   = 15232\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\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},\n+\t{\n+\t.app_id                  = 3,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 32\n+\t.count                   = 128\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 2\n+\t.count                   = 6\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 32\n+\t.count                   = 128\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 16\n+\t.count                   = 63\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 32\n+\t.count                   = 128\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\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_FULL_ACT_RECORD,\n-\t.count                   = 528\n+\t.count                   = 4096\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\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                   = 256\n+\t.count                   = 1024\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\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                   = 1\n+\t},\n+\t{\n+\t.app_id                  = 3,\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_EM_FKB,\n-\t.count                   = 4\n+\t.count                   = 32\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\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_WC_FKB,\n-\t.count                   = 4\n+\t.count                   = 32\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\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_ENCAP_64B,\n-\t.count                   = 4\n+\t.count                   = 1024\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\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_SP_SMAC_IPV4,\n-\t.count                   = 4\n+\t.count                   = 1024\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\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_MODIFY_64B,\n+\t.count                   = 1024\n+\t},\n+\t{\n+\t.app_id                  = 3,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 32\n+\t.count                   = 128\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 2\n+\t.count                   = 6\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 32\n+\t.count                   = 128\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 4\n+\t.count                   = 2048\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 1024\n+\t.count                   = 6144\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 32\n+\t.count                   = 128\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 2\n+\t.count                   = 6\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 4\n+\t.count                   = 128\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 4\n+\t.count                   = 63\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 4\n+\t.count                   = 128\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\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_FULL_ACT_RECORD,\n-\t.count                   = 512\n+\t.count                   = 4096\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\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                   = 256\n+\t.count                   = 1024\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\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},\n+\t{\n+\t.app_id                  = 3,\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_EM_FKB,\n-\t.count                   = 4\n+\t.count                   = 32\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\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_WC_FKB,\n-\t.count                   = 4\n+\t.count                   = 32\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\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_ENCAP_64B,\n-\t.count                   = 4\n+\t.count                   = 1024\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\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_SP_SMAC_IPV4,\n-\t.count                   = 4\n+\t.count                   = 1024\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\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_MODIFY_64B,\n+\t.count                   = 1024\n+\t},\n+\t{\n+\t.app_id                  = 3,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 32\n+\t.count                   = 128\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 2\n+\t.count                   = 6\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 32\n+\t.count                   = 128\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 4\n+\t.count                   = 2048\n \t},\n \t{\n-\t.app_id                  = 1,\n+\t.app_id                  = 3,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 1024\n+\t.count                   = 6144\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\n \t.direction               = TF_DIR_RX,\n \t.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n@@ -2837,7 +4964,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 32\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\n \t.direction               = TF_DIR_RX,\n \t.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n@@ -2845,7 +4972,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 2\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\n \t.direction               = TF_DIR_RX,\n \t.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n@@ -2853,7 +4980,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\n \t.direction               = TF_DIR_RX,\n \t.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n@@ -2861,7 +4988,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\n \t.direction               = TF_DIR_RX,\n \t.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n@@ -2869,7 +4996,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\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@@ -2877,7 +5004,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 128\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\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@@ -2885,7 +5012,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 128\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\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@@ -2893,7 +5020,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\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@@ -2901,7 +5028,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\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@@ -2909,7 +5036,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\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@@ -2917,7 +5044,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\n \t.direction               = TF_DIR_RX,\n \t.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n@@ -2925,7 +5052,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 32\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\n \t.direction               = TF_DIR_RX,\n \t.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n@@ -2933,7 +5060,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 2\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\n \t.direction               = TF_DIR_RX,\n \t.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n@@ -2941,15 +5068,15 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 32\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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                   = 64\n+\t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\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@@ -2957,7 +5084,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 1024\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\n \t.direction               = TF_DIR_TX,\n \t.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n@@ -2965,7 +5092,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 32\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\n \t.direction               = TF_DIR_TX,\n \t.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n@@ -2973,7 +5100,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 2\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\n \t.direction               = TF_DIR_TX,\n \t.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n@@ -2981,7 +5108,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\n \t.direction               = TF_DIR_TX,\n \t.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n@@ -2989,7 +5116,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\n \t.direction               = TF_DIR_TX,\n \t.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n@@ -2997,7 +5124,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\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@@ -3005,7 +5132,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 128\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\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@@ -3013,7 +5140,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 128\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\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@@ -3021,7 +5148,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\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@@ -3029,7 +5156,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\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@@ -3037,7 +5164,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\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@@ -3045,7 +5172,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\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@@ -3053,7 +5180,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\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@@ -3061,7 +5188,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\n \t.direction               = TF_DIR_TX,\n \t.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n@@ -3069,7 +5196,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 32\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\n \t.direction               = TF_DIR_TX,\n \t.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n@@ -3077,7 +5204,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 2\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\n \t.direction               = TF_DIR_TX,\n \t.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n@@ -3085,7 +5212,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 32\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\n \t.direction               = TF_DIR_TX,\n \t.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n@@ -3093,7 +5220,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\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@@ -3101,7 +5228,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 1024\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\n \t.direction               = TF_DIR_RX,\n \t.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n@@ -3109,7 +5236,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 32\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\n \t.direction               = TF_DIR_RX,\n \t.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n@@ -3117,7 +5244,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 2\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\n \t.direction               = TF_DIR_RX,\n \t.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n@@ -3125,7 +5252,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 32\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\n \t.direction               = TF_DIR_RX,\n \t.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n@@ -3133,7 +5260,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 16\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\n \t.direction               = TF_DIR_RX,\n \t.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n@@ -3141,7 +5268,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 32\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\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@@ -3149,7 +5276,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 528\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\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@@ -3157,7 +5284,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 256\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\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@@ -3165,7 +5292,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\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@@ -3173,7 +5300,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\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@@ -3181,7 +5308,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\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@@ -3189,7 +5316,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\n \t.direction               = TF_DIR_RX,\n \t.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n@@ -3197,7 +5324,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 32\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\n \t.direction               = TF_DIR_RX,\n \t.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n@@ -3205,7 +5332,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 2\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\n \t.direction               = TF_DIR_RX,\n \t.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n@@ -3213,15 +5340,15 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 32\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 512\n+\t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\n \t.direction               = TF_DIR_RX,\n \t.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,\n@@ -3229,7 +5356,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 1024\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\n \t.direction               = TF_DIR_TX,\n \t.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n@@ -3237,7 +5364,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 32\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\n \t.direction               = TF_DIR_TX,\n \t.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n@@ -3245,7 +5372,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 2\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\n \t.direction               = TF_DIR_TX,\n \t.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n@@ -3253,7 +5380,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\n \t.direction               = TF_DIR_TX,\n \t.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n@@ -3261,7 +5388,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\n \t.direction               = TF_DIR_TX,\n \t.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,\n@@ -3269,7 +5396,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\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@@ -3277,7 +5404,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 512\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\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@@ -3285,7 +5412,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 256\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\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@@ -3293,7 +5420,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\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@@ -3301,7 +5428,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\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@@ -3309,7 +5436,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\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@@ -3317,7 +5444,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\n \t.direction               = TF_DIR_TX,\n \t.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n@@ -3325,7 +5452,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 32\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\n \t.direction               = TF_DIR_TX,\n \t.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n@@ -3333,7 +5460,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 2\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\n \t.direction               = TF_DIR_TX,\n \t.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n@@ -3341,7 +5468,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 32\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\n \t.direction               = TF_DIR_TX,\n \t.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,\n@@ -3349,7 +5476,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 2,\n+\t.app_id                  = 4,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\n \t.direction               = TF_DIR_TX,\n \t.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,\n@@ -3357,596 +5484,532 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {\n \t.count                   = 1024\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 5,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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                  = 3,\n+\t.app_id                  = 5,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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                  = 3,\n+\t.app_id                  = 5,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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                   = 191\n+\t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 5,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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                   = 63\n+\t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 5,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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                  = 3,\n+\t.app_id                  = 5,\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_FULL_ACT_RECORD,\n-\t.count                   = 8192\n+\t.count                   = 128\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 5,\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_ACT_STATS_64,\n-\t.count                   = 7168\n+\t.count                   = 128\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 5,\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_ACT_MODIFY_IPV4,\n-\t.count                   = 1023\n+\t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 5,\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_ACT_ENCAP_8B,\n-\t.count                   = 511\n+\t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 5,\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_ACT_ENCAP_16B,\n-\t.count                   = 15\n+\t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 5,\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_ACT_SP_SMAC,\n-\t.count                   = 255\n-\t},\n-\t{\n-\t.app_id                  = 3,\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                  = 3,\n+\t.app_id                  = 5,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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                  = 3,\n+\t.app_id                  = 5,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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                  = 3,\n+\t.app_id                  = 5,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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                  = 3,\n+\t.app_id                  = 5,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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                   = 64\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 5,\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_EM_RECORD,\n-\t.count                   = 13168\n-\t},\n-\t{\n-\t.app_id                  = 3,\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                  = 3,\n+\t.app_id                  = 5,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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                  = 3,\n+\t.app_id                  = 5,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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                  = 3,\n+\t.app_id                  = 5,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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                   = 191\n+\t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 5,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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                  = 3,\n+\t.app_id                  = 5,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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                  = 3,\n+\t.app_id                  = 5,\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_FULL_ACT_RECORD,\n-\t.count                   = 8192\n+\t.count                   = 128\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 5,\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_ACT_STATS_64,\n-\t.count                   = 7168\n+\t.count                   = 128\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 5,\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_ACT_MODIFY_IPV4,\n-\t.count                   = 1023\n+\t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 5,\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_ACT_ENCAP_64B,\n-\t.count                   = 511\n+\t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 5,\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_ACT_ENCAP_16B,\n-\t.count                   = 223\n+\t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 5,\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_ACT_ENCAP_8B,\n-\t.count                   = 255\n+\t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 5,\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_ACT_SP_SMAC_IPV4,\n-\t.count                   = 488\n+\t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 5,\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_ACT_SP_SMAC_IPV6,\n-\t.count                   = 511\n-\t},\n-\t{\n-\t.app_id                  = 3,\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                  = 3,\n+\t.app_id                  = 5,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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                  = 3,\n+\t.app_id                  = 5,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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                  = 3,\n+\t.app_id                  = 5,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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                  = 3,\n+\t.app_id                  = 5,\n \t.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,\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                  = 3,\n+\t.app_id                  = 5,\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_EM_RECORD,\n-\t.count                   = 15232\n-\t},\n-\t{\n-\t.app_id                  = 3,\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                  = 3,\n+\t.app_id                  = 5,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 128\n+\t.count                   = 32\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 5,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                  = 3,\n+\t.app_id                  = 5,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 128\n+\t.count                   = 32\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 5,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 63\n+\t.count                   = 16\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 5,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 128\n+\t.count                   = 32\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 5,\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_FULL_ACT_RECORD,\n-\t.count                   = 4096\n+\t.count                   = 528\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 5,\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                   = 1024\n-\t},\n-\t{\n-\t.app_id                  = 3,\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                   = 1\n+\t.count                   = 256\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 5,\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_EM_FKB,\n-\t.count                   = 32\n+\t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 5,\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_WC_FKB,\n-\t.count                   = 32\n+\t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 5,\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_ENCAP_64B,\n-\t.count                   = 1024\n+\t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 5,\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_SP_SMAC_IPV4,\n-\t.count                   = 1024\n-\t},\n-\t{\n-\t.app_id                  = 3,\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_MODIFY_64B,\n-\t.count                   = 1024\n+\t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 5,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 128\n+\t.count                   = 32\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 5,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                  = 3,\n+\t.app_id                  = 5,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                  = 3,\n+\t.app_id                  = 5,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 2048\n+\t.count                   = 512\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 5,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 6144\n+\t.count                   = 1024\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 5,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 128\n+\t.count                   = 32\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 5,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 6\n+\t.count                   = 2\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 5,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 128\n+\t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 5,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                  = 3,\n+\t.app_id                  = 5,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 128\n+\t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 5,\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_FULL_ACT_RECORD,\n-\t.count                   = 4096\n+\t.count                   = 512\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 5,\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                   = 1024\n-\t},\n-\t{\n-\t.app_id                  = 3,\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                   = 256\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 5,\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_EM_FKB,\n-\t.count                   = 32\n+\t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 5,\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_WC_FKB,\n-\t.count                   = 32\n+\t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 5,\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_ENCAP_64B,\n-\t.count                   = 1024\n+\t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 5,\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_SP_SMAC_IPV4,\n-\t.count                   = 1024\n-\t},\n-\t{\n-\t.app_id                  = 3,\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_MODIFY_64B,\n-\t.count                   = 1024\n+\t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 5,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 128\n+\t.count                   = 32\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 5,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 6\n+\t.count                   = 2\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 5,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                  = 3,\n+\t.app_id                  = 5,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 2048\n+\t.count                   = 4\n \t},\n \t{\n-\t.app_id                  = 3,\n+\t.app_id                  = 5,\n \t.device_id               = BNXT_ULP_DEVICE_ID_THOR,\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                   = 6144\n+\t.count                   = 1024\n \t}\n };\n \ndiff --git a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_thor_act.c b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_thor_act.c\nindex e49c1151d3..8869ab1c33 100644\n--- a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_thor_act.c\n+++ b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_thor_act.c\n@@ -3,7 +3,7 @@\n  * All rights reserved.\n  */\n \n-/* date: Tue Aug 17 12:16:42 2021 */\n+/* date: Fri Oct  8 11:41:10 2021 */\n \n #include \"ulp_template_db_enum.h\"\n #include \"ulp_template_db_field.h\"\n@@ -1575,8 +1575,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_ACT_BIT_DEC_TTL & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_RF,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_RF_IDX_MODIFY_PTR >> 8) & 0xff,\n-\t\tBNXT_ULP_RF_IDX_MODIFY_PTR & 0xff},\n+\t(BNXT_ULP_RF_IDX_MODIFY_PTR >> 8) & 0xff,\n+\tBNXT_ULP_RF_IDX_MODIFY_PTR & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t},\n \t{\n@@ -1607,7 +1607,7 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\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_THOR_SYM_DECAP_FUNC_THRU_TUN},\n+\tULP_THOR_SYM_DECAP_FUNC_THRU_TUN},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr3 = {\n \tULP_THOR_SYM_DECAP_FUNC_NONE}\n@@ -1666,8 +1666,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\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-\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.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t},\n \t{\n@@ -1692,7 +1692,7 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr2 = {\n-\t\tULP_THOR_SYM_VLAN_DEL_RPT_STRIP_OUTER},\n+\tULP_THOR_SYM_VLAN_DEL_RPT_STRIP_OUTER},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t},\n \t{\n@@ -1747,7 +1747,7 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\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_THOR_SYM_DECAP_FUNC_THRU_TUN},\n+\tULP_THOR_SYM_DECAP_FUNC_THRU_TUN},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr3 = {\n \tULP_THOR_SYM_DECAP_FUNC_NONE}\n@@ -1806,8 +1806,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\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-\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.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t},\n \t{\n@@ -1832,7 +1832,7 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr2 = {\n-\t\tULP_THOR_SYM_VLAN_DEL_RPT_STRIP_OUTER},\n+\tULP_THOR_SYM_VLAN_DEL_RPT_STRIP_OUTER},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t},\n \t{\n@@ -2149,7 +2149,7 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_ACT_BIT_SET_IPV4_SRC & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr2 = {\n-\t\t1},\n+\t1},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t},\n \t{\n@@ -2168,7 +2168,7 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_ACT_BIT_SET_IPV4_DST & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr2 = {\n-\t\t1},\n+\t1},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t},\n \t{\n@@ -2187,7 +2187,7 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr2 = {\n-\t\t1},\n+\t1},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t},\n \t{\n@@ -2206,7 +2206,7 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr2 = {\n-\t\t1},\n+\t1},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t},\n \t{\n@@ -2373,8 +2373,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_ACT_BIT_SET_IPV4_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_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.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -2393,8 +2393,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_ACT_BIT_SET_IPV4_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_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.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -2413,8 +2413,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\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-\t\tBNXT_ULP_ACT_PROP_IDX_SET_TP_SRC & 0xff},\n+\t(BNXT_ULP_ACT_PROP_IDX_SET_TP_SRC >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_SET_TP_SRC & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -2433,8 +2433,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\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-\t\tBNXT_ULP_ACT_PROP_IDX_SET_TP_DST & 0xff},\n+\t(BNXT_ULP_ACT_PROP_IDX_SET_TP_DST >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_SET_TP_DST & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t/* act_tid: 3, , table: mod_record.ing_no_ttl */\n@@ -2526,7 +2526,7 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_ACT_BIT_SET_IPV4_SRC & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr2 = {\n-\t\t1},\n+\t1},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t},\n \t{\n@@ -2545,7 +2545,7 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_ACT_BIT_SET_IPV4_DST & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr2 = {\n-\t\t1},\n+\t1},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t},\n \t{\n@@ -2564,7 +2564,7 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr2 = {\n-\t\t1},\n+\t1},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t},\n \t{\n@@ -2583,7 +2583,7 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr2 = {\n-\t\t1},\n+\t1},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t},\n \t{\n@@ -2737,8 +2737,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_ACT_BIT_SET_IPV4_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_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.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -2757,8 +2757,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_ACT_BIT_SET_IPV4_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_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.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -2777,8 +2777,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\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-\t\tBNXT_ULP_ACT_PROP_IDX_SET_TP_SRC & 0xff},\n+\t(BNXT_ULP_ACT_PROP_IDX_SET_TP_SRC >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_SET_TP_SRC & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -2797,8 +2797,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\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-\t\tBNXT_ULP_ACT_PROP_IDX_SET_TP_DST & 0xff},\n+\t(BNXT_ULP_ACT_PROP_IDX_SET_TP_DST >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_SET_TP_DST & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t/* act_tid: 3, , table: int_full_act_record.0 */\n@@ -3593,7 +3593,7 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_ACT_BIT_SET_IPV4_SRC & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr2 = {\n-\t\t1},\n+\t1},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t},\n \t{\n@@ -3612,7 +3612,7 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_ACT_BIT_SET_IPV4_DST & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr2 = {\n-\t\t1},\n+\t1},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t},\n \t{\n@@ -3631,7 +3631,7 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr2 = {\n-\t\t1},\n+\t1},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t},\n \t{\n@@ -3650,7 +3650,7 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr2 = {\n-\t\t1},\n+\t1},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t},\n \t{\n@@ -3817,8 +3817,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_ACT_BIT_SET_IPV4_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_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.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -3837,8 +3837,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_ACT_BIT_SET_IPV4_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_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.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -3857,8 +3857,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\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-\t\tBNXT_ULP_ACT_PROP_IDX_SET_TP_SRC & 0xff},\n+\t(BNXT_ULP_ACT_PROP_IDX_SET_TP_SRC >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_SET_TP_SRC & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -3877,8 +3877,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\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-\t\tBNXT_ULP_ACT_PROP_IDX_SET_TP_DST & 0xff},\n+\t(BNXT_ULP_ACT_PROP_IDX_SET_TP_DST >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_SET_TP_DST & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t/* act_tid: 5, , table: mod_record.ing_no_ttl */\n@@ -3970,7 +3970,7 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_ACT_BIT_SET_IPV4_SRC & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr2 = {\n-\t\t1},\n+\t1},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t},\n \t{\n@@ -3989,7 +3989,7 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_ACT_BIT_SET_IPV4_DST & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr2 = {\n-\t\t1},\n+\t1},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t},\n \t{\n@@ -4008,7 +4008,7 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr2 = {\n-\t\t1},\n+\t1},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t},\n \t{\n@@ -4027,7 +4027,7 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr2 = {\n-\t\t1},\n+\t1},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t},\n \t{\n@@ -4181,8 +4181,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_ACT_BIT_SET_IPV4_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_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.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -4201,8 +4201,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_ACT_BIT_SET_IPV4_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_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.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -4221,8 +4221,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\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-\t\tBNXT_ULP_ACT_PROP_IDX_SET_TP_SRC & 0xff},\n+\t(BNXT_ULP_ACT_PROP_IDX_SET_TP_SRC >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_SET_TP_SRC & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -4241,8 +4241,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\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-\t\tBNXT_ULP_ACT_PROP_IDX_SET_TP_DST & 0xff},\n+\t(BNXT_ULP_ACT_PROP_IDX_SET_TP_DST >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_SET_TP_DST & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t/* act_tid: 5, , table: int_full_act_record.0 */\n@@ -4526,8 +4526,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_O_VLAN_TCI >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_O_VLAN_TCI & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_O_VLAN_TCI >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_O_VLAN_TCI & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -4546,8 +4546,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_O_VLAN_TYPE >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_O_VLAN_TYPE & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_O_VLAN_TYPE >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_O_VLAN_TYPE & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -4566,8 +4566,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_OI_VLAN & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_I_VLAN_TCI >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_I_VLAN_TCI & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_I_VLAN_TCI >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_I_VLAN_TCI & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -4586,8 +4586,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_OI_VLAN & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_I_VLAN_TYPE >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_I_VLAN_TYPE & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_I_VLAN_TYPE >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_I_VLAN_TYPE & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -4833,8 +4833,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_O_VLAN_TCI >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_O_VLAN_TCI & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_O_VLAN_TCI >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_O_VLAN_TCI & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -4853,8 +4853,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_O_VLAN_TYPE >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_O_VLAN_TYPE & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_O_VLAN_TYPE >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_O_VLAN_TYPE & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -4873,8 +4873,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_OI_VLAN & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_I_VLAN_TCI >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_I_VLAN_TCI & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_I_VLAN_TCI >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_I_VLAN_TCI & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -4893,8 +4893,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_OI_VLAN & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_I_VLAN_TYPE >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_I_VLAN_TYPE & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_I_VLAN_TYPE >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_I_VLAN_TYPE & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\ndiff --git a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_thor_class.c b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_thor_class.c\nindex 54bc032b0c..2d464fb7c4 100644\n--- a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_thor_class.c\n+++ b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_thor_class.c\n@@ -3,7 +3,7 @@\n  * All rights reserved.\n  */\n \n-/* date: Thu Sep  9 12:11:08 2021 */\n+/* date: Fri Oct  8 11:41:10 2021 */\n \n #include \"ulp_template_db_enum.h\"\n #include \"ulp_template_db_field.h\"\n@@ -3232,8 +3232,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\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(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.field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t\t.field_opr3 = {\n \t\t(BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n@@ -3302,7 +3302,7 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\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_THOR_SYM_L4_HDR_TYPE_TCP},\n+\t\tULP_THOR_SYM_L4_HDR_TYPE_TCP},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr3 = {\n \t\tULP_THOR_SYM_L4_HDR_TYPE_UDP}\n@@ -3492,7 +3492,7 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\t(uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr2 = {\n-\t\t\tULP_THOR_SYM_L2_VTAG_PRESENT_YES},\n+\t\tULP_THOR_SYM_L2_VTAG_PRESENT_YES},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr3 = {\n \t\tULP_THOR_SYM_L2_VTAG_PRESENT_NO}\n@@ -3871,8 +3871,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\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(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.field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t\t.field_opr3 = {\n \t\t(BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n@@ -3987,8 +3987,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\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(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.field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t\t.field_opr3 = {\n \t\t(BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n@@ -4821,8 +4821,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 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_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_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t\t},\n \t.field_info_spec = {\n@@ -4835,8 +4835,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 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_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_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t\t}\n \t},\n@@ -4959,8 +4959,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_OO_VLAN_FB_VID & 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-\t\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t\t},\n \t.field_info_spec = {\n@@ -4973,8 +4973,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_OO_VLAN_FB_VID & 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-\t\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t\t}\n \t},\n@@ -5037,8 +5037,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 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_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.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t\t},\n \t.field_info_spec = {\n@@ -5051,8 +5051,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 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_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.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t\t}\n \t},\n@@ -5091,8 +5091,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 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_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.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t\t},\n \t.field_info_spec = {\n@@ -5105,8 +5105,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 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_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.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t\t}\n \t},\n@@ -5153,8 +5153,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_O_L3_FB_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-\t\t\tBNXT_ULP_CF_IDX_O_L3_PROTO_ID & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L3_PROTO_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L3_PROTO_ID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t\t}\n \t},\n@@ -5358,8 +5358,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_O_L4_FB_SRC_PORT & 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-\t\t\tBNXT_ULP_CF_IDX_O_L4_SRC_PORT & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4_SRC_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4_SRC_PORT & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t\t}\n \t},\n@@ -5383,8 +5383,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_O_L4_FB_DST_PORT & 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-\t\t\tBNXT_ULP_CF_IDX_O_L4_DST_PORT & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4_DST_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4_DST_PORT & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t\t}\n \t},\n@@ -5542,8 +5542,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\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(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.field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t\t.field_opr3 = {\n \t\t(BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n@@ -5612,7 +5612,7 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\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_THOR_SYM_L4_HDR_TYPE_TCP},\n+\t\tULP_THOR_SYM_L4_HDR_TYPE_TCP},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr3 = {\n \t\tULP_THOR_SYM_L4_HDR_TYPE_UDP}\n@@ -5659,7 +5659,7 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_O_L4 & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr2 = {\n-\t\t\tULP_THOR_SYM_L4_HDR_VALID_YES},\n+\t\tULP_THOR_SYM_L4_HDR_VALID_YES},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr3 = {\n \t\tULP_THOR_SYM_L4_HDR_VALID_IGNORE}\n@@ -5749,7 +5749,7 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\t(uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr2 = {\n-\t\t\tULP_THOR_SYM_L3_HDR_TYPE_IPV4},\n+\t\tULP_THOR_SYM_L3_HDR_TYPE_IPV4},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr3 = {\n \t\tULP_THOR_SYM_L3_HDR_TYPE_IPV6}\n@@ -5830,7 +5830,7 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\t(uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr2 = {\n-\t\t\tULP_THOR_SYM_L2_VTAG_PRESENT_YES},\n+\t\tULP_THOR_SYM_L2_VTAG_PRESENT_YES},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr3 = {\n \t\tULP_THOR_SYM_L2_VTAG_PRESENT_NO}\n@@ -6209,8 +6209,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\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(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.field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t\t.field_opr3 = {\n \t\t(BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n@@ -6734,7 +6734,7 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\t(uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr2 = {\n-\t\t\tULP_THOR_SYM_L3_HDR_TYPE_IPV4},\n+\t\tULP_THOR_SYM_L3_HDR_TYPE_IPV4},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr3 = {\n \t\tULP_THOR_SYM_L3_HDR_TYPE_IPV6}\n@@ -6815,7 +6815,7 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\t(uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr2 = {\n-\t\t\tULP_THOR_SYM_TL2_VTAG_PRESENT_YES},\n+\t\tULP_THOR_SYM_TL2_VTAG_PRESENT_YES},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr3 = {\n \t\tULP_THOR_SYM_TL2_VTAG_PRESENT_NO}\n@@ -6900,8 +6900,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\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(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.field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t\t.field_opr3 = {\n \t\t(BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n@@ -7018,8 +7018,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\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(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.field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t\t.field_opr3 = {\n \t\t(BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n@@ -7852,8 +7852,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 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_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_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -7866,8 +7866,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 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_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_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -7990,8 +7990,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_OO_VLAN_FB_VID & 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-\t\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -8004,8 +8004,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_OO_VLAN_FB_VID & 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-\t\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -8056,8 +8056,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 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_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.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -8070,8 +8070,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 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_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.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -8110,8 +8110,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 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_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.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -8124,8 +8124,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 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_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.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -8187,8 +8187,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_O_L3_FB_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-\t\t\tBNXT_ULP_CF_IDX_O_L3_PROTO_ID & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L3_PROTO_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L3_PROTO_ID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -8383,8 +8383,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_O_L4_FB_SRC_PORT & 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_MASK >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_L4_SRC_PORT_MASK & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4_SRC_PORT_MASK >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4_SRC_PORT_MASK & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -8397,8 +8397,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_O_L4_FB_SRC_PORT & 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-\t\t\tBNXT_ULP_CF_IDX_O_L4_SRC_PORT & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4_SRC_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4_SRC_PORT & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -8413,8 +8413,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_O_L4_FB_DST_PORT & 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_MASK >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_L4_DST_PORT_MASK & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4_DST_PORT_MASK >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4_DST_PORT_MASK & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -8427,8 +8427,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_O_L4_FB_DST_PORT & 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-\t\t\tBNXT_ULP_CF_IDX_O_L4_DST_PORT & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4_DST_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4_DST_PORT & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -9359,8 +9359,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 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_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_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -9373,8 +9373,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 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_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_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -9497,8 +9497,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_OO_VLAN_FB_VID & 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-\t\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -9511,8 +9511,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_OO_VLAN_FB_VID & 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-\t\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -9575,8 +9575,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 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_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.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -9589,8 +9589,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 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_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.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -9629,8 +9629,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 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_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.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -9643,8 +9643,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 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_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.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -9694,8 +9694,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_O_L3_FB_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-\t\t\tBNXT_ULP_CF_IDX_O_L3_PROTO_ID & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L3_PROTO_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L3_PROTO_ID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -9901,8 +9901,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_O_L4_FB_SRC_PORT & 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-\t\t\tBNXT_ULP_CF_IDX_O_L4_SRC_PORT & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4_SRC_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4_SRC_PORT & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -9928,8 +9928,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_O_L4_FB_DST_PORT & 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-\t\t\tBNXT_ULP_CF_IDX_O_L4_DST_PORT & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4_DST_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4_DST_PORT & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -10860,8 +10860,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 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_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_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -10874,8 +10874,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 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_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_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -10998,8 +10998,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_OO_VLAN_FB_VID & 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-\t\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -11012,8 +11012,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_OO_VLAN_FB_VID & 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-\t\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -11064,8 +11064,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 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_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.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -11078,8 +11078,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 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_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.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -11118,8 +11118,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 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_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.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -11132,8 +11132,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 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_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.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -11195,8 +11195,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_O_L3_FB_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-\t\t\tBNXT_ULP_CF_IDX_O_L3_PROTO_ID & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L3_PROTO_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L3_PROTO_ID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -12335,8 +12335,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 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_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_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -12349,8 +12349,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 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_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_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -12473,8 +12473,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_OO_VLAN_FB_VID & 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-\t\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -12487,8 +12487,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_OO_VLAN_FB_VID & 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-\t\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -12551,8 +12551,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 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_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.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -12565,8 +12565,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 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_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.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -12605,8 +12605,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 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_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.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -12619,8 +12619,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 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_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.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -12670,8 +12670,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_O_L3_FB_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-\t\t\tBNXT_ULP_CF_IDX_O_L3_PROTO_ID & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L3_PROTO_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L3_PROTO_ID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -13810,8 +13810,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 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_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_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -13824,8 +13824,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 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_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_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -13948,8 +13948,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_OO_VLAN_FB_VID & 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-\t\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -13962,8 +13962,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_OO_VLAN_FB_VID & 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-\t\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -14712,8 +14712,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_OO_VLAN_FB_VID & 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-\t\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -14726,8 +14726,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_OO_VLAN_FB_VID & 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-\t\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -14778,8 +14778,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 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_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.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -14792,8 +14792,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_IPV4_SRC_ADDR & 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_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.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -14832,8 +14832,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 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_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.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -14846,8 +14846,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_IPV4_DST_ADDR & 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_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.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -14909,8 +14909,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_O_L3_FB_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-\t\t\tBNXT_ULP_CF_IDX_O_L3_PROTO_ID & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L3_PROTO_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L3_PROTO_ID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -15093,8 +15093,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_O_L4_FB_SRC_PORT & 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_MASK >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_L4_SRC_PORT_MASK & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4_SRC_PORT_MASK >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4_SRC_PORT_MASK & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -15107,8 +15107,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_O_L4_FB_SRC_PORT & 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-\t\t\tBNXT_ULP_CF_IDX_O_L4_SRC_PORT & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4_SRC_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4_SRC_PORT & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -15123,8 +15123,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_O_L4_FB_DST_PORT & 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_MASK >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_L4_DST_PORT_MASK & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4_DST_PORT_MASK >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4_DST_PORT_MASK & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -15137,8 +15137,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_O_L4_FB_DST_PORT & 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-\t\t\tBNXT_ULP_CF_IDX_O_L4_DST_PORT & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4_DST_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4_DST_PORT & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -15345,8 +15345,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 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_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_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -15359,8 +15359,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 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_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_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -16219,8 +16219,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_OO_VLAN_FB_VID & 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-\t\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -16233,8 +16233,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_OO_VLAN_FB_VID & 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-\t\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -16297,8 +16297,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 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_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.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -16311,8 +16311,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 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_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.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -16351,8 +16351,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 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_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.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -16365,8 +16365,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 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_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.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -16416,8 +16416,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_O_L3_FB_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-\t\t\tBNXT_ULP_CF_IDX_O_L3_PROTO_ID & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L3_PROTO_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L3_PROTO_ID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -16600,8 +16600,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_O_L4_FB_SRC_PORT & 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_MASK >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_L4_SRC_PORT_MASK & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4_SRC_PORT_MASK >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4_SRC_PORT_MASK & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -16614,8 +16614,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_O_L4_FB_SRC_PORT & 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-\t\t\tBNXT_ULP_CF_IDX_O_L4_SRC_PORT & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4_SRC_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4_SRC_PORT & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -16630,8 +16630,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_O_L4_FB_DST_PORT & 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_MASK >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_L4_DST_PORT_MASK & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4_DST_PORT_MASK >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4_DST_PORT_MASK & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -16644,8 +16644,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_O_L4_FB_DST_PORT & 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-\t\t\tBNXT_ULP_CF_IDX_O_L4_DST_PORT & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4_DST_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4_DST_PORT & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -16852,8 +16852,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 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_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_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -16866,8 +16866,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 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_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_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -18434,7 +18434,7 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\t(uint64_t)BNXT_ULP_HDR_BIT_I_TCP & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr2 = {\n-\t\t\tULP_THOR_SYM_L4_HDR_TYPE_TCP},\n+\t\tULP_THOR_SYM_L4_HDR_TYPE_TCP},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr3 = {\n \t\tULP_THOR_SYM_L4_HDR_TYPE_UDP}\n@@ -19848,8 +19848,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_T_VXLAN_VNI & 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_T_VXLAN_VNI >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_T_VXLAN_VNI & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_T_VXLAN_VNI >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_T_VXLAN_VNI & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t\t},\n \t.field_info_spec = {\n@@ -19862,8 +19862,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_T_VXLAN_VNI & 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_T_VXLAN_VNI >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_T_VXLAN_VNI & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_T_VXLAN_VNI >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_T_VXLAN_VNI & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t\t}\n \t},\n@@ -19970,8 +19970,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_I_ETH_SMAC & 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_I_ETH_SMAC >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_I_ETH_SMAC & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_I_ETH_SMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_I_ETH_SMAC & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t\t},\n \t.field_info_spec = {\n@@ -19984,8 +19984,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_I_ETH_SMAC & 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_I_ETH_SMAC >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_I_ETH_SMAC & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_I_ETH_SMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_I_ETH_SMAC & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t\t}\n \t},\n@@ -20168,8 +20168,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_I_IPV6_SRC_ADDR & 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_I_IPV6_SRC_ADDR >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_I_IPV6_SRC_ADDR & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_I_IPV6_SRC_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_I_IPV6_SRC_ADDR & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t\t},\n \t.field_info_spec = {\n@@ -20182,8 +20182,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_I_IPV6_SRC_ADDR & 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_I_IPV6_SRC_ADDR >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_I_IPV6_SRC_ADDR & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_I_IPV6_SRC_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_I_IPV6_SRC_ADDR & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t\t}\n \t},\n@@ -20222,8 +20222,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_I_IPV6_DST_ADDR & 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_I_IPV6_DST_ADDR >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_I_IPV6_DST_ADDR & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_I_IPV6_DST_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_I_IPV6_DST_ADDR & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t\t},\n \t.field_info_spec = {\n@@ -20236,8 +20236,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_I_IPV6_DST_ADDR & 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_I_IPV6_DST_ADDR >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_I_IPV6_DST_ADDR & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_I_IPV6_DST_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_I_IPV6_DST_ADDR & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t\t}\n \t},\n@@ -20284,8 +20284,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_I_L3_FB_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_I_L3_PROTO_ID >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_I_L3_PROTO_ID & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_I_L3_PROTO_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_I_L3_PROTO_ID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t\t}\n \t},\n@@ -20489,8 +20489,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_I_L4_FB_SRC_PORT & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr2 = {\n-\t\t\t(BNXT_ULP_CF_IDX_I_L4_SRC_PORT >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_I_L4_SRC_PORT & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_I_L4_SRC_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_I_L4_SRC_PORT & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t\t}\n \t},\n@@ -20514,8 +20514,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_I_L4_FB_DST_PORT & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr2 = {\n-\t\t\t(BNXT_ULP_CF_IDX_I_L4_DST_PORT >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_I_L4_DST_PORT & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_I_L4_DST_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_I_L4_DST_PORT & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t\t}\n \t},\n@@ -22120,8 +22120,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_T_VXLAN_VNI & 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_T_VXLAN_VNI >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_T_VXLAN_VNI & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_T_VXLAN_VNI >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_T_VXLAN_VNI & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -22134,8 +22134,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_T_VXLAN_VNI & 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_T_VXLAN_VNI >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_T_VXLAN_VNI & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_T_VXLAN_VNI >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_T_VXLAN_VNI & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -22242,8 +22242,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_I_ETH_SMAC & 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_I_ETH_SMAC >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_I_ETH_SMAC & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_I_ETH_SMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_I_ETH_SMAC & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -22256,8 +22256,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_I_ETH_SMAC & 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_I_ETH_SMAC >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_I_ETH_SMAC & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_I_ETH_SMAC >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_I_ETH_SMAC & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -22428,8 +22428,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_I_IPV4_SRC_ADDR & 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_I_IPV4_SRC_ADDR >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_I_IPV4_SRC_ADDR & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_I_IPV4_SRC_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_I_IPV4_SRC_ADDR & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -22442,8 +22442,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_I_IPV4_SRC_ADDR & 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_I_IPV4_SRC_ADDR >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_I_IPV4_SRC_ADDR & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_I_IPV4_SRC_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_I_IPV4_SRC_ADDR & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -22482,8 +22482,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_I_IPV4_DST_ADDR & 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_I_IPV4_DST_ADDR >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_I_IPV4_DST_ADDR & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_I_IPV4_DST_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_I_IPV4_DST_ADDR & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -22496,8 +22496,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_I_IPV4_DST_ADDR & 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_I_IPV4_DST_ADDR >> 8) & 0xff,\n-\t\t\tBNXT_ULP_GLB_HF_ID_I_IPV4_DST_ADDR & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_I_IPV4_DST_ADDR >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_I_IPV4_DST_ADDR & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -22559,8 +22559,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_I_L3_FB_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_I_L3_PROTO_ID >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_I_L3_PROTO_ID & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_I_L3_PROTO_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_I_L3_PROTO_ID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -22755,8 +22755,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_I_L4_FB_SRC_PORT & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr2 = {\n-\t\t\t(BNXT_ULP_CF_IDX_I_L4_SRC_PORT_MASK >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_I_L4_SRC_PORT_MASK & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_I_L4_SRC_PORT_MASK >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_I_L4_SRC_PORT_MASK & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -22769,8 +22769,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_I_L4_FB_SRC_PORT & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr2 = {\n-\t\t\t(BNXT_ULP_CF_IDX_I_L4_SRC_PORT >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_I_L4_SRC_PORT & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_I_L4_SRC_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_I_L4_SRC_PORT & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -22785,8 +22785,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_I_L4_FB_DST_PORT & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr2 = {\n-\t\t\t(BNXT_ULP_CF_IDX_I_L4_DST_PORT_MASK >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_I_L4_DST_PORT_MASK & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_I_L4_DST_PORT_MASK >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_I_L4_DST_PORT_MASK & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -22799,8 +22799,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_I_L4_FB_DST_PORT & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_CF,\n \t\t.field_opr2 = {\n-\t\t\t(BNXT_ULP_CF_IDX_I_L4_DST_PORT >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_I_L4_DST_PORT & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_I_L4_DST_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_I_L4_DST_PORT & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -23041,7 +23041,7 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\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_THOR_SYM_L4_HDR_TYPE_TCP},\n+\t\tULP_THOR_SYM_L4_HDR_TYPE_TCP},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr3 = {\n \t\tULP_THOR_SYM_L4_HDR_TYPE_UDP}\n@@ -23231,7 +23231,7 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\t(uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr2 = {\n-\t\t\tULP_THOR_SYM_L2_VTAG_PRESENT_YES},\n+\t\tULP_THOR_SYM_L2_VTAG_PRESENT_YES},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr3 = {\n \t\tULP_THOR_SYM_L2_VTAG_PRESENT_NO}\n@@ -24532,8 +24532,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 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_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_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t\t},\n \t.field_info_spec = {\n@@ -24546,8 +24546,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 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_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_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t\t}\n \t},\n@@ -24562,8 +24562,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 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_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_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t\t},\n \t.field_info_spec = {\n@@ -24576,8 +24576,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 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_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_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t\t}\n \t},\n@@ -24700,8 +24700,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_OO_VLAN_FB_VID & 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-\t\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t\t},\n \t.field_info_spec = {\n@@ -24714,8 +24714,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_OO_VLAN_FB_VID & 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-\t\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t\t}\n \t},\n@@ -24778,8 +24778,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 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_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.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t\t},\n \t.field_info_spec = {\n@@ -24792,8 +24792,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_IPV6_SRC_ADDR & 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_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.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t\t}\n \t},\n@@ -24832,8 +24832,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 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_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.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t\t},\n \t.field_info_spec = {\n@@ -24846,8 +24846,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_IPV6_DST_ADDR & 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_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.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t\t}\n \t},\n@@ -24894,8 +24894,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_O_L3_FB_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-\t\t\tBNXT_ULP_CF_IDX_O_L3_PROTO_ID & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L3_PROTO_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L3_PROTO_ID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t\t}\n \t},\n@@ -25099,8 +25099,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_O_L4_FB_SRC_PORT & 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-\t\t\tBNXT_ULP_CF_IDX_O_L4_SRC_PORT & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4_SRC_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4_SRC_PORT & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t\t}\n \t},\n@@ -25124,8 +25124,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_O_L4_FB_DST_PORT & 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-\t\t\tBNXT_ULP_CF_IDX_O_L4_DST_PORT & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4_DST_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4_DST_PORT & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t\t}\n \t},\n@@ -25345,7 +25345,7 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\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_THOR_SYM_L4_HDR_TYPE_TCP},\n+\t\tULP_THOR_SYM_L4_HDR_TYPE_TCP},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr3 = {\n \t\tULP_THOR_SYM_L4_HDR_TYPE_UDP}\n@@ -25469,7 +25469,7 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\t(uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr2 = {\n-\t\t\tULP_THOR_SYM_L3_HDR_TYPE_IPV4},\n+\t\tULP_THOR_SYM_L3_HDR_TYPE_IPV4},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr3 = {\n \t\tULP_THOR_SYM_L3_HDR_TYPE_IPV6}\n@@ -25548,7 +25548,7 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\t(uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr2 = {\n-\t\t\tULP_THOR_SYM_L2_VTAG_PRESENT_YES},\n+\t\tULP_THOR_SYM_L2_VTAG_PRESENT_YES},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr3 = {\n \t\tULP_THOR_SYM_L2_VTAG_PRESENT_NO}\n@@ -26210,7 +26210,7 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\t(uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr2 = {\n-\t\t\tULP_THOR_SYM_L2_VTAG_PRESENT_YES},\n+\t\tULP_THOR_SYM_L2_VTAG_PRESENT_YES},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr3 = {\n \t\tULP_THOR_SYM_L2_VTAG_PRESENT_NO}\n@@ -27511,8 +27511,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 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_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_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -27525,8 +27525,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 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_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_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -27541,8 +27541,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 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_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_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -27555,8 +27555,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 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_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_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -27679,8 +27679,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_OO_VLAN_FB_VID & 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-\t\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -27693,8 +27693,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_OO_VLAN_FB_VID & 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-\t\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -27856,8 +27856,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_O_L3_FB_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-\t\t\tBNXT_ULP_CF_IDX_O_L3_PROTO_ID & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L3_PROTO_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L3_PROTO_ID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -28052,8 +28052,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_O_L4_FB_SRC_PORT & 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_MASK >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_L4_SRC_PORT_MASK & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4_SRC_PORT_MASK >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4_SRC_PORT_MASK & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -28066,8 +28066,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_O_L4_FB_SRC_PORT & 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-\t\t\tBNXT_ULP_CF_IDX_O_L4_SRC_PORT & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4_SRC_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4_SRC_PORT & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -28082,8 +28082,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_O_L4_FB_DST_PORT & 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_MASK >> 8) & 0xff,\n-\t\t\tBNXT_ULP_CF_IDX_O_L4_DST_PORT_MASK & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4_DST_PORT_MASK >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4_DST_PORT_MASK & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -28096,8 +28096,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_O_L4_FB_DST_PORT & 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-\t\t\tBNXT_ULP_CF_IDX_O_L4_DST_PORT & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4_DST_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4_DST_PORT & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -29016,8 +29016,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 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_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_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -29030,8 +29030,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 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_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_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -29046,8 +29046,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 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_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_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -29060,8 +29060,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 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_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_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -29184,8 +29184,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_OO_VLAN_FB_VID & 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-\t\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -29198,8 +29198,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_OO_VLAN_FB_VID & 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-\t\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -29361,8 +29361,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_O_L3_FB_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-\t\t\tBNXT_ULP_CF_IDX_O_L3_PROTO_ID & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L3_PROTO_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L3_PROTO_ID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -30489,8 +30489,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 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_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_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -30503,8 +30503,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 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_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_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -30519,8 +30519,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 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_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_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -30533,8 +30533,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_GLB_HF_ID_O_ETH_SMAC & 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_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_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -30657,8 +30657,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_OO_VLAN_FB_VID & 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-\t\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -30671,8 +30671,8 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {\n \t\tBNXT_ULP_CF_IDX_OO_VLAN_FB_VID & 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-\t\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -34679,8 +34679,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_class_result_field_list[] = {\n \tBNXT_ULP_GLB_HF_ID_O_ETH_DMAC & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t.field_opr2 = {\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.field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t.field_opr3 = {\n \t(BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n@@ -35206,8 +35206,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_class_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n-\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n+\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n+\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t},\n \t{\n@@ -36920,8 +36920,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_class_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_1 >> 8) & 0xff,\n-\t\tBNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_1 & 0xff},\n+\t(BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_1 >> 8) & 0xff,\n+\tBNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_1 & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t.field_opr3 = {\n \t(BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0 >> 8) & 0xff,\n@@ -36991,8 +36991,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_class_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_3 >> 8) & 0xff,\n-\t\tBNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_3 & 0xff},\n+\t(BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_3 >> 8) & 0xff,\n+\tBNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_3 & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t.field_opr3 = {\n \t(BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_2 >> 8) & 0xff,\n@@ -38986,8 +38986,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_class_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_5 >> 8) & 0xff,\n-\t\tBNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_5 & 0xff},\n+\t(BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_5 >> 8) & 0xff,\n+\tBNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_5 & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t.field_opr3 = {\n \t(BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_4 >> 8) & 0xff,\n@@ -39570,8 +39570,8 @@ struct bnxt_ulp_mapper_field_info ulp_thor_class_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_FIELD_BIT,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n-\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n+\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n+\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t},\n \t{\ndiff --git a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_wh_plus_act.c b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_wh_plus_act.c\nindex 4a2d201c2d..16a921e6c8 100644\n--- a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_wh_plus_act.c\n+++ b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_wh_plus_act.c\n@@ -3,7 +3,7 @@\n  * All rights reserved.\n  */\n \n-/* date: Wed Aug 25 14:37:06 2021 */\n+/* date: Fri Oct  8 11:41:10 2021 */\n \n #include \"ulp_template_db_enum.h\"\n #include \"ulp_template_db_field.h\"\n@@ -1210,8 +1210,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\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-\t\tBNXT_ULP_ACT_PROP_IDX_SET_TP_DST & 0xff},\n+\t(BNXT_ULP_ACT_PROP_IDX_SET_TP_DST >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_SET_TP_DST & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t},\n \t{\n@@ -1239,8 +1239,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\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-\t\tBNXT_ULP_ACT_PROP_IDX_SET_TP_SRC & 0xff},\n+\t(BNXT_ULP_ACT_PROP_IDX_SET_TP_SRC >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_SET_TP_SRC & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t},\n \t{\n@@ -1295,7 +1295,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\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+\tULP_WP_SYM_DECAP_FUNC_THRU_TUN},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr3 = {\n \tULP_WP_SYM_DECAP_FUNC_NONE}\n@@ -1346,8 +1346,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\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-\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.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t},\n \t{\n@@ -1481,8 +1481,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\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-\t\tBNXT_ULP_ACT_PROP_IDX_SET_TP_DST & 0xff},\n+\t(BNXT_ULP_ACT_PROP_IDX_SET_TP_DST >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_SET_TP_DST & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t},\n \t{\n@@ -1510,8 +1510,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\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-\t\tBNXT_ULP_ACT_PROP_IDX_SET_TP_SRC & 0xff},\n+\t(BNXT_ULP_ACT_PROP_IDX_SET_TP_SRC >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_SET_TP_SRC & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t},\n \t{\n@@ -1566,7 +1566,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\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+\tULP_WP_SYM_DECAP_FUNC_THRU_TUN},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr3 = {\n \tULP_WP_SYM_DECAP_FUNC_NONE}\n@@ -1893,7 +1893,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_PLUS_SRC2,\n \t.field_src2 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr2 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"drop\",\n@@ -2088,7 +2088,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_PLUS_SRC2,\n \t.field_src2 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr2 = {\n-\t\t1}\n+\t1}\n \t},\n \t{\n \t.description = \"drop\",\n@@ -2222,8 +2222,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t.field_opc = BNXT_ULP_FIELD_OPC_SRC1_PLUS_SRC2_POST,\n \t.field_src2 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr2 = {\n-\t\t(1 >> 8) & 0xff,\n-\t\t1 & 0xff}\n+\t(1 >> 8) & 0xff,\n+\t1 & 0xff}\n \t},\n \t/* act_tid: 3, , table: int_flow_counter_tbl.0 */\n \t{\n@@ -2418,8 +2418,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\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-\t\tBNXT_ULP_ACT_PROP_IDX_SET_TP_DST & 0xff},\n+\t(BNXT_ULP_ACT_PROP_IDX_SET_TP_DST >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_SET_TP_DST & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t},\n \t{\n@@ -2447,8 +2447,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\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-\t\tBNXT_ULP_ACT_PROP_IDX_SET_TP_SRC & 0xff},\n+\t(BNXT_ULP_ACT_PROP_IDX_SET_TP_SRC >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_SET_TP_SRC & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t},\n \t{\n@@ -2503,7 +2503,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\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+\tULP_WP_SYM_DECAP_FUNC_THRU_TL2},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr3 = {\n \tULP_WP_SYM_DECAP_FUNC_THRU_L2}\n@@ -2662,8 +2662,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\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-\t\tBNXT_ULP_ACT_PROP_IDX_SET_TP_DST & 0xff},\n+\t(BNXT_ULP_ACT_PROP_IDX_SET_TP_DST >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_SET_TP_DST & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t},\n \t{\n@@ -2691,8 +2691,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\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-\t\tBNXT_ULP_ACT_PROP_IDX_SET_TP_SRC & 0xff},\n+\t(BNXT_ULP_ACT_PROP_IDX_SET_TP_SRC >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_SET_TP_SRC & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t},\n \t{\n@@ -2747,7 +2747,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\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+\tULP_WP_SYM_DECAP_FUNC_THRU_TL2},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr3 = {\n \tULP_WP_SYM_DECAP_FUNC_THRU_L2}\n@@ -3853,8 +3853,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\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-\t\tBNXT_ULP_ACT_PROP_IDX_SET_TP_DST & 0xff},\n+\t(BNXT_ULP_ACT_PROP_IDX_SET_TP_DST >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_SET_TP_DST & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t},\n \t{\n@@ -3882,8 +3882,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\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-\t\tBNXT_ULP_ACT_PROP_IDX_SET_TP_SRC & 0xff},\n+\t(BNXT_ULP_ACT_PROP_IDX_SET_TP_SRC >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_SET_TP_SRC & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t},\n \t{\n@@ -3938,7 +3938,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\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+\tULP_WP_SYM_DECAP_FUNC_THRU_TL2},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr3 = {\n \tULP_WP_SYM_DECAP_FUNC_THRU_L2}\n@@ -4097,8 +4097,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\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-\t\tBNXT_ULP_ACT_PROP_IDX_SET_TP_DST & 0xff},\n+\t(BNXT_ULP_ACT_PROP_IDX_SET_TP_DST >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_SET_TP_DST & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t},\n \t{\n@@ -4126,8 +4126,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\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-\t\tBNXT_ULP_ACT_PROP_IDX_SET_TP_SRC & 0xff},\n+\t(BNXT_ULP_ACT_PROP_IDX_SET_TP_SRC >> 8) & 0xff,\n+\tBNXT_ULP_ACT_PROP_IDX_SET_TP_SRC & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t},\n \t{\n@@ -4182,7 +4182,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\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+\tULP_WP_SYM_DECAP_FUNC_THRU_TL2},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_CONST,\n \t.field_opr3 = {\n \tULP_WP_SYM_DECAP_FUNC_THRU_L2}\n@@ -4415,8 +4415,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_O_VLAN_TCI >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_O_VLAN_TCI & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_O_VLAN_TCI >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_O_VLAN_TCI & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -4435,8 +4435,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_O_VLAN_TYPE >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_O_VLAN_TYPE & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_O_VLAN_TYPE >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_O_VLAN_TYPE & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -4455,8 +4455,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_OI_VLAN & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_I_VLAN_TCI >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_I_VLAN_TCI & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_I_VLAN_TCI >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_I_VLAN_TCI & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -4475,8 +4475,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_OI_VLAN & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_I_VLAN_TYPE >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_I_VLAN_TYPE & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_I_VLAN_TYPE >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_I_VLAN_TYPE & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -4495,8 +4495,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_IPV4_IHL >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_IPV4_IHL & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_IPV4_IHL >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_IPV4_IHL & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -4515,8 +4515,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_IPV4_TOS >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_IPV4_TOS & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_IPV4_TOS >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_IPV4_TOS & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -4535,8 +4535,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_IPV4_PKT_ID >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_IPV4_PKT_ID & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_IPV4_PKT_ID >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_IPV4_PKT_ID & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -4555,8 +4555,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_IPV4_FRAG >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_IPV4_FRAG & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_IPV4_FRAG >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_IPV4_FRAG & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -4575,8 +4575,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_IPV4_TTL >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_IPV4_TTL & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_IPV4_TTL >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_IPV4_TTL & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -4595,8 +4595,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_IPV4_PROTO >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_IPV4_PROTO & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_IPV4_PROTO >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_IPV4_PROTO & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -4615,8 +4615,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_IPV4_DADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_IPV4_DADDR & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_IPV4_DADDR >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_IPV4_DADDR & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -4635,8 +4635,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_IPV6_VTC_FLOW >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_IPV6_VTC_FLOW & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_IPV6_VTC_FLOW >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_IPV6_VTC_FLOW & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -4672,8 +4672,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_IPV6_PROTO >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_IPV6_PROTO & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_IPV6_PROTO >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_IPV6_PROTO & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -4692,8 +4692,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_IPV6_TTL >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_IPV6_TTL & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_IPV6_TTL >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_IPV6_TTL & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -4712,8 +4712,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_IPV6_DADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_IPV6_DADDR & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_IPV6_DADDR >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_IPV6_DADDR & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -4732,8 +4732,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_O_UDP & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_UDP_SPORT >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_UDP_SPORT & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_UDP_SPORT >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_UDP_SPORT & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -4752,8 +4752,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_O_UDP & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_UDP_DPORT >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_UDP_DPORT & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_UDP_DPORT >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_UDP_DPORT & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -4772,8 +4772,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_VXLAN_FLAGS >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_VXLAN_FLAGS & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_VXLAN_FLAGS >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_VXLAN_FLAGS & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -4792,8 +4792,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_VXLAN_RSVD0 >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_VXLAN_RSVD0 & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_VXLAN_RSVD0 >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_VXLAN_RSVD0 & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -4812,8 +4812,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_VXLAN_VNI >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_VXLAN_VNI & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_VXLAN_VNI >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_VXLAN_VNI & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -4832,8 +4832,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_VXLAN_RSVD1 >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_VXLAN_RSVD1 & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_VXLAN_RSVD1 >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_VXLAN_RSVD1 & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t/* act_tid: 6, , table: int_full_act_record.0 */\n@@ -5264,8 +5264,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_O_VLAN_TCI >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_O_VLAN_TCI & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_O_VLAN_TCI >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_O_VLAN_TCI & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -5284,8 +5284,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_O_VLAN_TYPE >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_O_VLAN_TYPE & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_O_VLAN_TYPE >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_O_VLAN_TYPE & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -5304,8 +5304,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_OI_VLAN & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_I_VLAN_TCI >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_I_VLAN_TCI & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_I_VLAN_TCI >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_I_VLAN_TCI & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -5324,8 +5324,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_OI_VLAN & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_I_VLAN_TYPE >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_I_VLAN_TYPE & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_I_VLAN_TYPE >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_I_VLAN_TYPE & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -5344,8 +5344,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_IPV4_IHL >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_IPV4_IHL & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_IPV4_IHL >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_IPV4_IHL & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -5364,8 +5364,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_IPV4_TOS >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_IPV4_TOS & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_IPV4_TOS >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_IPV4_TOS & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -5384,8 +5384,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_IPV4_PKT_ID >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_IPV4_PKT_ID & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_IPV4_PKT_ID >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_IPV4_PKT_ID & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -5404,8 +5404,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_IPV4_FRAG >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_IPV4_FRAG & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_IPV4_FRAG >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_IPV4_FRAG & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -5424,8 +5424,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_IPV4_TTL >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_IPV4_TTL & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_IPV4_TTL >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_IPV4_TTL & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -5444,8 +5444,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_IPV4_PROTO >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_IPV4_PROTO & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_IPV4_PROTO >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_IPV4_PROTO & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -5464,8 +5464,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_IPV4_DADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_IPV4_DADDR & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_IPV4_DADDR >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_IPV4_DADDR & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -5484,8 +5484,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_IPV6_VTC_FLOW >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_IPV6_VTC_FLOW & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_IPV6_VTC_FLOW >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_IPV6_VTC_FLOW & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -5521,8 +5521,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_IPV6_PROTO >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_IPV6_PROTO & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_IPV6_PROTO >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_IPV6_PROTO & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -5541,8 +5541,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_IPV6_TTL >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_IPV6_TTL & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_IPV6_TTL >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_IPV6_TTL & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -5561,8 +5561,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_IPV6_DADDR >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_IPV6_DADDR & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_IPV6_DADDR >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_IPV6_DADDR & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -5581,8 +5581,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_O_UDP & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_UDP_SPORT >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_UDP_SPORT & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_UDP_SPORT >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_UDP_SPORT & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -5601,8 +5601,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_O_UDP & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_UDP_DPORT >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_UDP_DPORT & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_UDP_DPORT >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_UDP_DPORT & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -5621,8 +5621,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_VXLAN_FLAGS >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_VXLAN_FLAGS & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_VXLAN_FLAGS >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_VXLAN_FLAGS & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -5641,8 +5641,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_VXLAN_RSVD0 >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_VXLAN_RSVD0 & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_VXLAN_RSVD0 >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_VXLAN_RSVD0 & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -5661,8 +5661,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_VXLAN_VNI >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_VXLAN_VNI & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_VXLAN_VNI >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_VXLAN_VNI & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t},\n \t{\n@@ -5681,8 +5681,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {\n \t(uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN & 0xff},\n \t.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,\n \t.field_opr2 = {\n-\t\t(BNXT_ULP_ENC_FIELD_VXLAN_RSVD1 >> 8) & 0xff,\n-\t\tBNXT_ULP_ENC_FIELD_VXLAN_RSVD1 & 0xff},\n+\t(BNXT_ULP_ENC_FIELD_VXLAN_RSVD1 >> 8) & 0xff,\n+\tBNXT_ULP_ENC_FIELD_VXLAN_RSVD1 & 0xff},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_SKIP\n \t}\n };\ndiff --git a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_wh_plus_class.c b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_wh_plus_class.c\nindex 4b9cb7fd5b..d1c3ebe065 100644\n--- a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_wh_plus_class.c\n+++ b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_wh_plus_class.c\n@@ -3,7 +3,7 @@\n  * All rights reserved.\n  */\n \n-/* date: Wed Aug 11 16:00:16 2021 */\n+/* date: Fri Oct  8 11:41:10 2021 */\n \n #include \"ulp_template_db_enum.h\"\n #include \"ulp_template_db_field.h\"\n@@ -2198,8 +2198,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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-\t\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -2218,8 +2218,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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-\t\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -2261,8 +2261,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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-\t\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -2281,8 +2281,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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-\t\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -2550,8 +2550,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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-\t\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -2570,8 +2570,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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-\t\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -2631,8 +2631,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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(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.field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t\t.field_opr3 = {\n \t\t(BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n@@ -2701,7 +2701,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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\tULP_WP_SYM_L4_HDR_TYPE_TCP},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr3 = {\n \t\tULP_WP_SYM_L4_HDR_TYPE_UDP}\n@@ -3258,8 +3258,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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(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.field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t\t.field_opr3 = {\n \t\t(BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n@@ -3383,7 +3383,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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\tULP_WP_SYM_L4_HDR_TYPE_TCP},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr3 = {\n \t\tULP_WP_SYM_L4_HDR_TYPE_UDP}\n@@ -3942,8 +3942,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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(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.field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t\t.field_opr3 = {\n \t\t(BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n@@ -4702,8 +4702,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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(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.field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t\t.field_opr3 = {\n \t\t(BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n@@ -4778,8 +4778,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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-\t\t\tBNXT_ULP_CF_IDX_O_L4_DST_PORT & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4_DST_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4_DST_PORT & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -4803,8 +4803,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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-\t\t\tBNXT_ULP_CF_IDX_O_L4_SRC_PORT & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4_SRC_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4_SRC_PORT & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -4827,8 +4827,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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-\t\t\tBNXT_ULP_CF_IDX_O_L3_PROTO_ID & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L3_PROTO_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L3_PROTO_ID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -4980,8 +4980,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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-\t\t\tBNXT_ULP_CF_IDX_O_L4_DST_PORT & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4_DST_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4_DST_PORT & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -5005,8 +5005,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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-\t\t\tBNXT_ULP_CF_IDX_O_L4_SRC_PORT & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4_SRC_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4_SRC_PORT & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -5029,8 +5029,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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-\t\t\tBNXT_ULP_CF_IDX_O_L3_PROTO_ID & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L3_PROTO_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L3_PROTO_ID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -5182,8 +5182,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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-\t\t\tBNXT_ULP_CF_IDX_O_L4_DST_PORT & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4_DST_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4_DST_PORT & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -5207,8 +5207,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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-\t\t\tBNXT_ULP_CF_IDX_O_L4_SRC_PORT & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4_SRC_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4_SRC_PORT & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -5231,8 +5231,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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-\t\t\tBNXT_ULP_CF_IDX_O_L3_PROTO_ID & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L3_PROTO_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L3_PROTO_ID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -5398,8 +5398,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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-\t\t\tBNXT_ULP_CF_IDX_O_L4_DST_PORT & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4_DST_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4_DST_PORT & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -5423,8 +5423,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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-\t\t\tBNXT_ULP_CF_IDX_O_L4_SRC_PORT & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4_SRC_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4_SRC_PORT & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -5447,8 +5447,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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-\t\t\tBNXT_ULP_CF_IDX_O_L3_PROTO_ID & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L3_PROTO_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L3_PROTO_ID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -6746,7 +6746,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\n \t\t(uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 & 0xff},\n \t\t.field_src2 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr2 = {\n-\t\t\tULP_WP_SYM_L3_HDR_TYPE_IPV4},\n+\t\tULP_WP_SYM_L3_HDR_TYPE_IPV4},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr3 = {\n \t\tULP_WP_SYM_L3_HDR_TYPE_IPV6}\n@@ -7714,8 +7714,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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-\t\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -7734,8 +7734,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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-\t\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -7777,8 +7777,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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-\t\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -7797,8 +7797,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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-\t\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -8066,8 +8066,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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-\t\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t},\n \t.field_info_spec = {\n@@ -8086,8 +8086,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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-\t\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n+\t\t(BNXT_ULP_GLB_HF_ID_OO_VLAN_VID >> 8) & 0xff,\n+\t\tBNXT_ULP_GLB_HF_ID_OO_VLAN_VID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -8147,8 +8147,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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(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.field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t\t.field_opr3 = {\n \t\t(BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n@@ -8217,7 +8217,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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\tULP_WP_SYM_L4_HDR_TYPE_TCP},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr3 = {\n \t\tULP_WP_SYM_L4_HDR_TYPE_UDP}\n@@ -8774,8 +8774,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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(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.field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t\t.field_opr3 = {\n \t\t(BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n@@ -8899,7 +8899,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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\tULP_WP_SYM_L4_HDR_TYPE_TCP},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_CONST,\n \t\t.field_opr3 = {\n \t\tULP_WP_SYM_L4_HDR_TYPE_UDP}\n@@ -9458,8 +9458,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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(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.field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t\t.field_opr3 = {\n \t\t(BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n@@ -9576,8 +9576,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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(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.field_src3 = BNXT_ULP_FIELD_SRC_GLB_RF,\n \t\t.field_opr3 = {\n \t\t(BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n@@ -9652,8 +9652,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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-\t\t\tBNXT_ULP_CF_IDX_O_L4_DST_PORT & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4_DST_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4_DST_PORT & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -9677,8 +9677,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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-\t\t\tBNXT_ULP_CF_IDX_O_L4_SRC_PORT & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4_SRC_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4_SRC_PORT & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -9701,8 +9701,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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-\t\t\tBNXT_ULP_CF_IDX_O_L3_PROTO_ID & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L3_PROTO_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L3_PROTO_ID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -9854,8 +9854,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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-\t\t\tBNXT_ULP_CF_IDX_O_L4_DST_PORT & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4_DST_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4_DST_PORT & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -9879,8 +9879,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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-\t\t\tBNXT_ULP_CF_IDX_O_L4_SRC_PORT & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4_SRC_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4_SRC_PORT & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -9903,8 +9903,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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-\t\t\tBNXT_ULP_CF_IDX_O_L3_PROTO_ID & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L3_PROTO_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L3_PROTO_ID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -10056,8 +10056,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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-\t\t\tBNXT_ULP_CF_IDX_O_L4_DST_PORT & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4_DST_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4_DST_PORT & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -10081,8 +10081,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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-\t\t\tBNXT_ULP_CF_IDX_O_L4_SRC_PORT & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4_SRC_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4_SRC_PORT & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -10105,8 +10105,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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-\t\t\tBNXT_ULP_CF_IDX_O_L3_PROTO_ID & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L3_PROTO_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L3_PROTO_ID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -10272,8 +10272,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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-\t\t\tBNXT_ULP_CF_IDX_O_L4_DST_PORT & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4_DST_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4_DST_PORT & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -10297,8 +10297,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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-\t\t\tBNXT_ULP_CF_IDX_O_L4_SRC_PORT & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L4_SRC_PORT >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L4_SRC_PORT & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -10321,8 +10321,8 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {\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-\t\t\tBNXT_ULP_CF_IDX_O_L3_PROTO_ID & 0xff},\n+\t\t(BNXT_ULP_CF_IDX_O_L3_PROTO_ID >> 8) & 0xff,\n+\t\tBNXT_ULP_CF_IDX_O_L3_PROTO_ID & 0xff},\n \t\t.field_src3 = BNXT_ULP_FIELD_SRC_ZERO\n \t\t}\n \t},\n@@ -12392,8 +12392,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\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(BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT >> 8) & 0xff,\n+\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(BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT >> 8) & 0xff,\n@@ -12409,8 +12409,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\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(BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT >> 8) & 0xff,\n+\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(BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT >> 8) & 0xff,\n@@ -12544,8 +12544,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\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(BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT >> 8) & 0xff,\n+\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(BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT >> 8) & 0xff,\n@@ -12561,8 +12561,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\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(BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT >> 8) & 0xff,\n+\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(BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT >> 8) & 0xff,\n@@ -13715,7 +13715,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\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+\tULP_WP_SYM_LOOPBACK_PARIF},\n \t.field_src3 = BNXT_ULP_FIELD_SRC_CF,\n \t.field_opr3 = {\n \t(BNXT_ULP_CF_IDX_DRV_FUNC_PARIF >> 8) & 0xff,\n@@ -13887,8 +13887,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\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(BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT >> 8) & 0xff,\n+\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(BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT >> 8) & 0xff,\n@@ -13904,8 +13904,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\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(BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT >> 8) & 0xff,\n+\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(BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT >> 8) & 0xff,\n@@ -14039,8 +14039,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\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(BNXT_ULP_GLB_HF_ID_O_UDP_SRC_PORT >> 8) & 0xff,\n+\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(BNXT_ULP_GLB_HF_ID_O_TCP_SRC_PORT >> 8) & 0xff,\n@@ -14056,8 +14056,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {\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(BNXT_ULP_GLB_HF_ID_O_UDP_DST_PORT >> 8) & 0xff,\n+\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(BNXT_ULP_GLB_HF_ID_O_TCP_DST_PORT >> 8) & 0xff,\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c\nindex d21c088d59..2ec3279239 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c\n@@ -685,6 +685,11 @@ ulp_rte_phy_port_hdr_handler(const struct rte_flow_item *item,\n \thdr_field->size = sizeof(svif);\n \tULP_COMP_FLD_IDX_WR(params, BNXT_ULP_CF_IDX_SVIF_FLAG,\n \t\t\t    rte_be_to_cpu_16(svif));\n+\tif (!mask) {\n+\t\tULP_BITMAP_SET(params->hdr_bitmap.bits,\n+\t\t\t       BNXT_ULP_HDR_BIT_SVIF_IGNORE);\n+\t\tmemset(hdr_field->mask, 0xFF, sizeof(mask));\n+\t}\n \treturn BNXT_TF_RC_SUCCESS;\n }\n \n",
    "prefixes": [
        "v3",
        "13/20"
    ]
}