get:
Show a patch.

patch:
Update a patch.

put:
Update a patch.

GET /api/patches/71166/?format=api
HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 71166,
    "url": "http://patches.dpdk.org/api/patches/71166/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/20200610114427.22146-31-somnath.kotur@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": "<20200610114427.22146-31-somnath.kotur@broadcom.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20200610114427.22146-31-somnath.kotur@broadcom.com",
    "date": "2020-06-10T11:44:21",
    "name": "[30/36] net/bnxt: unify the mapper opcodes into single enum",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "6bff777c4430a731311e6e659be7ad2446b0c1d0",
    "submitter": {
        "id": 908,
        "url": "http://patches.dpdk.org/api/people/908/?format=api",
        "name": "Somnath Kotur",
        "email": "somnath.kotur@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/20200610114427.22146-31-somnath.kotur@broadcom.com/mbox/",
    "series": [
        {
            "id": 10380,
            "url": "http://patches.dpdk.org/api/series/10380/?format=api",
            "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=10380",
            "date": "2020-06-10T11:43:51",
            "name": "bnxt patches",
            "version": 1,
            "mbox": "http://patches.dpdk.org/series/10380/mbox/"
        }
    ],
    "comments": "http://patches.dpdk.org/api/patches/71166/comments/",
    "check": "success",
    "checks": "http://patches.dpdk.org/api/patches/71166/checks/",
    "tags": {},
    "related": [],
    "headers": {
        "Return-Path": "<dev-bounces@dpdk.org>",
        "X-Original-To": "patchwork@inbox.dpdk.org",
        "Delivered-To": "patchwork@inbox.dpdk.org",
        "Received": [
            "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 17A63A051B;\n\tWed, 10 Jun 2020 13:54:35 +0200 (CEST)",
            "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 74BF81BFB7;\n\tWed, 10 Jun 2020 13:49:38 +0200 (CEST)",
            "from relay.smtp.broadcom.com (relay.smtp.broadcom.com\n [192.19.232.149]) by dpdk.org (Postfix) with ESMTP id 4F20E1BF94\n for <dev@dpdk.org>; Wed, 10 Jun 2020 13:49:35 +0200 (CEST)",
            "from dhcp-10-123-153-55.dhcp.broadcom.net\n (dhcp-10-123-153-55.dhcp.broadcom.net [10.123.153.55])\n by relay.smtp.broadcom.com (Postfix) with ESMTP id A38481BD53A;\n Wed, 10 Jun 2020 04:49:34 -0700 (PDT)"
        ],
        "DKIM-Filter": "OpenDKIM Filter v2.10.3 relay.smtp.broadcom.com A38481BD53A",
        "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com;\n s=dkimrelay; t=1591789775;\n bh=lEIshgdD9m49cqLwcvr2rDCCRgbeDT3YunoCqqTOZiA=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=wRCNuYjJNc7pjRsaYhpSWDpIp2MkvjqfcEzGpVp1mSGr5U/nTGLIzuAoaCQxyfhJP\n 3naVWT69WF4tgC3hHgGBQO0YtrE0GKXkCuIuAWg+jODb+VMvaqCQViW9tUdgD8obJw\n 1cSlS+45NFglJi3/79ItTb1SO1+hDLcy/EbZmRjA=",
        "From": "Somnath Kotur <somnath.kotur@broadcom.com>",
        "To": "dev@dpdk.org",
        "Cc": "ferruh.yigit@intel.com",
        "Date": "Wed, 10 Jun 2020 17:14:21 +0530",
        "Message-Id": "<20200610114427.22146-31-somnath.kotur@broadcom.com>",
        "X-Mailer": "git-send-email 2.10.1.613.g2cc2e70",
        "In-Reply-To": "<20200610114427.22146-1-somnath.kotur@broadcom.com>",
        "References": "<20200610114427.22146-1-somnath.kotur@broadcom.com>",
        "Subject": "[dpdk-dev] [PATCH 30/36] net/bnxt: unify the mapper opcodes into\n\tsingle enum",
        "X-BeenThere": "dev@dpdk.org",
        "X-Mailman-Version": "2.1.15",
        "Precedence": "list",
        "List-Id": "DPDK patches and discussions <dev.dpdk.org>",
        "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>",
        "List-Archive": "<http://mails.dpdk.org/archives/dev/>",
        "List-Post": "<mailto:dev@dpdk.org>",
        "List-Help": "<mailto:dev-request@dpdk.org?subject=help>",
        "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>",
        "Errors-To": "dev-bounces@dpdk.org",
        "Sender": "\"dev\" <dev-bounces@dpdk.org>"
    },
    "content": "From: Mike Baucom <michael.baucom@broadcom.com>\n\nUnify the opcodes of the different enums into a single enum for reuse of\ncommon processors.\n\nSigned-off-by: Mike Baucom <michael.baucom@broadcom.com>\nReviewed-by: Kishore Padmanabha <kishore.padmanabha@broadcom.com>\nSigned-off-by: Somnath Kotur <somnath.kotur@broadcom.com>\n---\n drivers/net/bnxt/tf_ulp/ulp_mapper.c            |   26 +-\n drivers/net/bnxt/tf_ulp/ulp_template_db_act.c   |  180 ++--\n drivers/net/bnxt/tf_ulp/ulp_template_db_class.c | 1044 +++++++++++------------\n drivers/net/bnxt/tf_ulp/ulp_template_db_enum.h  |   39 +-\n drivers/net/bnxt/tf_ulp/ulp_template_struct.h   |   14 +-\n 5 files changed, 643 insertions(+), 660 deletions(-)",
    "diff": "diff --git a/drivers/net/bnxt/tf_ulp/ulp_mapper.c b/drivers/net/bnxt/tf_ulp/ulp_mapper.c\nindex 3872921..8492486 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_mapper.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_mapper.c\n@@ -615,14 +615,14 @@ ulp_mapper_result_field_process(struct bnxt_ulp_mapper_parms *parms,\n \tuint8_t act_val;\n \n \tswitch (fld->result_opcode) {\n-\tcase BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT:\n+\tcase BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT:\n \t\tval = fld->result_operand;\n \t\tif (!ulp_blob_push(blob, val, fld->field_bit_size)) {\n \t\t\tBNXT_TF_DBG(ERR, \"%s failed to add field\\n\", name);\n \t\t\treturn -EINVAL;\n \t\t}\n \t\tbreak;\n-\tcase BNXT_ULP_RESULT_OPC_SET_TO_ACT_PROP:\n+\tcase BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP:\n \t\tif (!ulp_operand_read(fld->result_operand,\n \t\t\t\t      (uint8_t *)&idx, sizeof(uint16_t))) {\n \t\t\tBNXT_TF_DBG(ERR, \"%s operand read failed\\n\", name);\n@@ -646,7 +646,7 @@ ulp_mapper_result_field_process(struct bnxt_ulp_mapper_parms *parms,\n \t\t\treturn -EINVAL;\n \t\t}\n \t\tbreak;\n-\tcase BNXT_ULP_RESULT_OPC_SET_TO_ACT_BIT:\n+\tcase BNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT:\n \t\tif (!ulp_operand_read(fld->result_operand,\n \t\t\t\t      (uint8_t *)&act_bit, sizeof(uint64_t))) {\n \t\t\tBNXT_TF_DBG(ERR, \"%s operand read failed\\n\", name);\n@@ -664,7 +664,7 @@ ulp_mapper_result_field_process(struct bnxt_ulp_mapper_parms *parms,\n \t\t}\n \t\tval = &act_val;\n \t\tbreak;\n-\tcase BNXT_ULP_RESULT_OPC_SET_TO_ENCAP_ACT_PROP_SZ:\n+\tcase BNXT_ULP_MAPPER_OPC_SET_TO_ENCAP_ACT_PROP_SZ:\n \t\tif (!ulp_operand_read(fld->result_operand,\n \t\t\t\t      (uint8_t *)&idx, sizeof(uint16_t))) {\n \t\t\tBNXT_TF_DBG(ERR, \"%s operand read failed\\n\", name);\n@@ -696,7 +696,7 @@ ulp_mapper_result_field_process(struct bnxt_ulp_mapper_parms *parms,\n \t\tval_size = ULP_BYTE_2_BITS(val_size);\n \t\tulp_blob_push_encap(blob, val, val_size);\n \t\tbreak;\n-\tcase BNXT_ULP_RESULT_OPC_SET_TO_REGFILE:\n+\tcase BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE:\n \t\tif (!ulp_operand_read(fld->result_operand,\n \t\t\t\t      (uint8_t *)&idx, sizeof(uint16_t))) {\n \t\t\tBNXT_TF_DBG(ERR, \"%s operand read failed\\n\", name);\n@@ -717,7 +717,7 @@ ulp_mapper_result_field_process(struct bnxt_ulp_mapper_parms *parms,\n \t\t\treturn -EINVAL;\n \t\t}\n \t\tbreak;\n-\tcase BNXT_ULP_RESULT_OPC_SET_TO_GLB_REGFILE:\n+\tcase BNXT_ULP_MAPPER_OPC_SET_TO_GLB_REGFILE:\n \t\tif (!ulp_operand_read(fld->result_operand,\n \t\t\t\t      (uint8_t *)&idx,\n \t\t\t\t      sizeof(uint16_t))) {\n@@ -738,7 +738,7 @@ ulp_mapper_result_field_process(struct bnxt_ulp_mapper_parms *parms,\n \t\t\treturn -EINVAL;\n \t\t}\n \t\tbreak;\n-\tcase BNXT_ULP_RESULT_OPC_SET_TO_COMP_FIELD:\n+\tcase BNXT_ULP_MAPPER_OPC_SET_TO_COMP_FIELD:\n \t\tif (!ulp_operand_read(fld->result_operand,\n \t\t\t\t      (uint8_t *)&idx,\n \t\t\t\t      sizeof(uint16_t))) {\n@@ -789,21 +789,21 @@ ulp_mapper_keymask_field_process(struct bnxt_ulp_mapper_parms *parms,\n \tbitlen = fld->field_bit_size;\n \n \tswitch (opcode) {\n-\tcase BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT:\n+\tcase BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT:\n \t\tval = operand;\n \t\tif (!ulp_blob_push(blob, val, bitlen)) {\n \t\t\tBNXT_TF_DBG(ERR, \"%s push to key blob failed\\n\", name);\n \t\t\treturn -EINVAL;\n \t\t}\n \t\tbreak;\n-\tcase BNXT_ULP_SPEC_OPC_ADD_PAD:\n+\tcase BNXT_ULP_MAPPER_OPC_ADD_PAD:\n \t\tif (!ulp_blob_pad_push(blob, bitlen)) {\n \t\t\tBNXT_TF_DBG(ERR, \"%s pad too large for blob\\n\", name);\n \t\t\treturn -EINVAL;\n \t\t}\n \n \t\tbreak;\n-\tcase BNXT_ULP_SPEC_OPC_SET_TO_HDR_FIELD:\n+\tcase BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD:\n \t\tif (!ulp_operand_read(operand, (uint8_t *)&idx,\n \t\t\t\t      sizeof(uint16_t))) {\n \t\t\tBNXT_TF_DBG(ERR, \"%s key operand read failed.\\n\", name);\n@@ -830,7 +830,7 @@ ulp_mapper_keymask_field_process(struct bnxt_ulp_mapper_parms *parms,\n \t\t\treturn -EINVAL;\n \t\t}\n \t\tbreak;\n-\tcase BNXT_ULP_SPEC_OPC_SET_TO_COMP_FIELD:\n+\tcase BNXT_ULP_MAPPER_OPC_SET_TO_COMP_FIELD:\n \t\tif (!ulp_operand_read(operand, (uint8_t *)&idx,\n \t\t\t\t      sizeof(uint16_t))) {\n \t\t\tBNXT_TF_DBG(ERR, \"%s key operand read failed.\\n\", name);\n@@ -845,7 +845,7 @@ ulp_mapper_keymask_field_process(struct bnxt_ulp_mapper_parms *parms,\n \t\t\treturn -EINVAL;\n \t\t}\n \t\tbreak;\n-\tcase BNXT_ULP_SPEC_OPC_SET_TO_REGFILE:\n+\tcase BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE:\n \t\tif (!ulp_operand_read(operand, (uint8_t *)&idx,\n \t\t\t\t      sizeof(uint16_t))) {\n \t\t\tBNXT_TF_DBG(ERR, \"%s key operand read failed.\\n\", name);\n@@ -865,7 +865,7 @@ ulp_mapper_keymask_field_process(struct bnxt_ulp_mapper_parms *parms,\n \t\t\treturn -EINVAL;\n \t\t}\n \t\tbreak;\n-\tcase BNXT_ULP_SPEC_OPC_SET_TO_GLB_REGFILE:\n+\tcase BNXT_ULP_MAPPER_OPC_SET_TO_GLB_REGFILE:\n \t\tif (!ulp_operand_read(operand, (uint8_t *)&idx,\n \t\t\t\t      sizeof(uint16_t))) {\n \t\t\tBNXT_TF_DBG(ERR, \"%s key operand read failed.\\n\", name);\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_act.c b/drivers/net/bnxt/tf_ulp/ulp_template_db_act.c\nindex bc471fe..d24851d 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_template_db_act.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_act.c\n@@ -109,127 +109,127 @@ struct bnxt_ulp_mapper_tbl_info ulp_act_tbl_list[] = {\n struct bnxt_ulp_mapper_result_field_info ulp_act_result_field_list[] = {\n \t{\n \t.field_bit_size = 14,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 8,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 11,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 10,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 16,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 10,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 16,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 10,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 4,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {\n \t\tBNXT_ULP_SYM_DECAP_FUNC_THRU_TUN,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -237,7 +237,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_act_result_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 12,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_ACT_PROP,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP,\n \t.result_operand = {\n \t\t(BNXT_ULP_ACT_PROP_IDX_VNIC >> 8) & 0xff,\n \t\tBNXT_ULP_ACT_PROP_IDX_VNIC & 0xff,\n@@ -246,151 +246,151 @@ struct bnxt_ulp_mapper_result_field_info ulp_act_result_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 2,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 14,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 8,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 11,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 10,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 16,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 10,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 16,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 10,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 4,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {\n \t\tBNXT_ULP_SYM_DECAP_FUNC_NONE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -398,7 +398,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_act_result_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 12,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_ACT_PROP,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP,\n \t.result_operand = {\n \t\t(BNXT_ULP_ACT_PROP_IDX_VPORT >> 8) & 0xff,\n \t\tBNXT_ULP_ACT_PROP_IDX_VPORT & 0xff,\n@@ -407,31 +407,31 @@ struct bnxt_ulp_mapper_result_field_info ulp_act_result_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 2,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 3,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {\n \t\tBNXT_ULP_SYM_ECV_TUN_TYPE_VXLAN,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -439,7 +439,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_act_result_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 3,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {\n \t\tBNXT_ULP_SYM_ECV_L4_TYPE_UDP_CSUM,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -447,7 +447,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_act_result_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 3,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_ACT_PROP,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP,\n \t.result_operand = {\n \t\t(BNXT_ULP_ACT_PROP_IDX_ENCAP_L3_TYPE >> 8) & 0xff,\n \t\tBNXT_ULP_ACT_PROP_IDX_ENCAP_L3_TYPE & 0xff,\n@@ -456,13 +456,13 @@ struct bnxt_ulp_mapper_result_field_info ulp_act_result_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 4,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_ACT_PROP,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP,\n \t.result_operand = {\n \t\t(BNXT_ULP_ACT_PROP_IDX_ENCAP_VTAG_TYPE >> 8) & 0xff,\n \t\tBNXT_ULP_ACT_PROP_IDX_ENCAP_VTAG_TYPE & 0xff,\n@@ -471,19 +471,19 @@ struct bnxt_ulp_mapper_result_field_info ulp_act_result_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 48,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_ACT_PROP,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP,\n \t.result_operand = {\n \t\t(BNXT_ULP_ACT_PROP_IDX_ENCAP_L2_DMAC >> 8) & 0xff,\n \t\tBNXT_ULP_ACT_PROP_IDX_ENCAP_L2_DMAC & 0xff,\n@@ -492,7 +492,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_act_result_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 0,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_ENCAP_ACT_PROP_SZ,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ENCAP_ACT_PROP_SZ,\n \t.result_operand = {\n \t\t(BNXT_ULP_ACT_PROP_IDX_ENCAP_VTAG >> 8) & 0xff,\n \t\tBNXT_ULP_ACT_PROP_IDX_ENCAP_VTAG & 0xff,\n@@ -503,7 +503,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_act_result_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 0,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_ENCAP_ACT_PROP_SZ,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ENCAP_ACT_PROP_SZ,\n \t.result_operand = {\n \t\t(BNXT_ULP_ACT_PROP_IDX_ENCAP_IP >> 8) & 0xff,\n \t\tBNXT_ULP_ACT_PROP_IDX_ENCAP_IP & 0xff,\n@@ -514,7 +514,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_act_result_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 32,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_ACT_PROP,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP,\n \t.result_operand = {\n \t\t(BNXT_ULP_ACT_PROP_IDX_ENCAP_UDP >> 8) & 0xff,\n \t\tBNXT_ULP_ACT_PROP_IDX_ENCAP_UDP & 0xff,\n@@ -523,7 +523,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_act_result_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 0,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_ENCAP_ACT_PROP_SZ,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ENCAP_ACT_PROP_SZ,\n \t.result_operand = {\n \t\t(BNXT_ULP_ACT_PROP_IDX_ENCAP_TUN >> 8) & 0xff,\n \t\tBNXT_ULP_ACT_PROP_IDX_ENCAP_TUN & 0xff,\n@@ -534,127 +534,127 @@ struct bnxt_ulp_mapper_result_field_info ulp_act_result_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 14,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 8,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 11,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 10,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 16,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 10,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 16,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 10,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 4,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {\n \t\tBNXT_ULP_SYM_DECAP_FUNC_NONE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -662,7 +662,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_act_result_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 12,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_ACT_PROP,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP,\n \t.result_operand = {\n \t\t(BNXT_ULP_ACT_PROP_IDX_VNIC >> 8) & 0xff,\n \t\tBNXT_ULP_ACT_PROP_IDX_VNIC & 0xff,\n@@ -671,25 +671,25 @@ struct bnxt_ulp_mapper_result_field_info ulp_act_result_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 2,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t}\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_class.c b/drivers/net/bnxt/tf_ulp/ulp_template_db_class.c\nindex f33136f..fbb40eb 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_template_db_class.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_class.c\n@@ -444,10 +444,10 @@ struct bnxt_ulp_mapper_tbl_info ulp_class_tbl_list[] = {\n struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t{\n \t.field_bit_size = 8,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_HDR_FIELD,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n \t\t(BNXT_ULP_HF0_IDX_SVIF_INDEX >> 8) & 0xff,\n \t\tBNXT_ULP_HF0_IDX_SVIF_INDEX & 0xff,\n@@ -456,10 +456,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 4,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TUN_HDR_TYPE_NONE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -467,40 +467,40 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 12,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 12,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 48,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 8,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_HDR_FIELD,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.mask_operand = {\n \t\t(BNXT_ULP_HF0_IDX_SVIF_INDEX >> 8) & 0xff,\n \t\tBNXT_ULP_HF0_IDX_SVIF_INDEX & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_HDR_FIELD,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n \t\t(BNXT_ULP_HF0_IDX_SVIF_INDEX >> 8) & 0xff,\n \t\tBNXT_ULP_HF0_IDX_SVIF_INDEX & 0xff,\n@@ -509,64 +509,64 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 4,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 12,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 12,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 48,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 2,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 2,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 4,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TUN_HDR_TYPE_NONE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -574,37 +574,37 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 2,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 7,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_GLB_REGFILE,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_GLB_REGFILE,\n \t.spec_operand = {\n \t\t(BNXT_ULP_GLB_REGFILE_INDEX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n \t\tBNXT_ULP_GLB_REGFILE_INDEX_GLB_PROF_FUNC_ID & 0xff,\n@@ -613,10 +613,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 8,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_REGFILE,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n \t.spec_operand = {\n \t\t(BNXT_ULP_REGFILE_INDEX_CLASS_TID >> 8) & 0xff,\n \t\tBNXT_ULP_REGFILE_INDEX_CLASS_TID & 0xff,\n@@ -625,10 +625,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L4_HDR_IS_UDP_TCP_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -636,10 +636,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 4,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L4_HDR_TYPE_UDP,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -647,10 +647,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L4_HDR_ERROR_NO,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -658,10 +658,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L4_HDR_VALID_YES,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -669,10 +669,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L3_IPV6_CMP_DST_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -680,10 +680,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L3_IPV6_CMP_SRC_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -691,10 +691,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L3_HDR_ISIP_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -702,10 +702,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 4,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L3_HDR_TYPE_IPV4,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -713,10 +713,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L3_HDR_ERROR_NO,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -724,10 +724,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L3_HDR_VALID_YES,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -735,10 +735,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L2_TWO_VTAGS_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -746,10 +746,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L2_VTAG_PRESENT_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -757,10 +757,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 2,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L2_UC_MC_BC_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -768,10 +768,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 2,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L2_HDR_TYPE_DIX,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -779,10 +779,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L2_HDR_ERROR_NO,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -790,10 +790,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L2_HDR_VALID_YES,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -801,10 +801,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 3,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TUN_HDR_FLAGS_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -812,10 +812,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 4,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TUN_HDR_TYPE_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -823,10 +823,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TUN_HDR_ERROR_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -834,10 +834,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TUN_HDR_VALID_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -845,10 +845,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TL4_HDR_IS_UDP_TCP_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -856,10 +856,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 4,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TL4_HDR_TYPE_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -867,10 +867,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TL4_HDR_ERROR_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -878,10 +878,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TL4_HDR_VALID_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -889,10 +889,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TL3_IPV6_CMP_DST_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -900,10 +900,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TL3_IPV6_CMP_SRC_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -911,10 +911,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TL3_HDR_ISIP_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -922,10 +922,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 4,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TL3_HDR_TYPE_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -933,10 +933,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TL3_HDR_ERROR_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -944,10 +944,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TL3_HDR_VALID_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -955,10 +955,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TL2_TWO_VTAGS_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -966,10 +966,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TL2_VTAG_PRESENT_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -977,10 +977,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 2,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TL2_UC_MC_BC_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -988,10 +988,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 2,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TL2_HDR_TYPE_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -999,10 +999,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TL2_HDR_VALID_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1010,10 +1010,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_HREC_NEXT_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1021,10 +1021,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 9,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\t(BNXT_ULP_SYM_RESERVED_IGNORE >> 8) & 0xff,\n \t\tBNXT_ULP_SYM_RESERVED_IGNORE & 0xff,\n@@ -1033,10 +1033,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 7,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_GLB_REGFILE,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_GLB_REGFILE,\n \t.spec_operand = {\n \t\t(BNXT_ULP_GLB_REGFILE_INDEX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n \t\tBNXT_ULP_GLB_REGFILE_INDEX_GLB_PROF_FUNC_ID & 0xff,\n@@ -1045,10 +1045,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_AGG_ERROR_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1056,10 +1056,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 2,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_RECYCLE_CNT_ZERO,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1067,10 +1067,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 4,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_PKT_TYPE_L2,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1078,37 +1078,37 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 251,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_ADD_PAD,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_ADD_PAD,\n \t.spec_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 3,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 16,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_HDR_FIELD,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n \t\t(BNXT_ULP_HF0_IDX_O_UDP_DST_PORT >> 8) & 0xff,\n \t\tBNXT_ULP_HF0_IDX_O_UDP_DST_PORT & 0xff,\n@@ -1117,10 +1117,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 16,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_HDR_FIELD,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n \t\t(BNXT_ULP_HF0_IDX_O_UDP_SRC_PORT >> 8) & 0xff,\n \t\tBNXT_ULP_HF0_IDX_O_UDP_SRC_PORT & 0xff,\n@@ -1129,10 +1129,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 8,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_IP_PROTO_UDP,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1140,10 +1140,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 32,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_HDR_FIELD,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n \t\t(BNXT_ULP_HF0_IDX_O_IPV4_DST_ADDR >> 8) & 0xff,\n \t\tBNXT_ULP_HF0_IDX_O_IPV4_DST_ADDR & 0xff,\n@@ -1152,10 +1152,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 32,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_HDR_FIELD,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n \t\t(BNXT_ULP_HF0_IDX_O_IPV4_SRC_ADDR >> 8) & 0xff,\n \t\tBNXT_ULP_HF0_IDX_O_IPV4_SRC_ADDR & 0xff,\n@@ -1164,28 +1164,28 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 48,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 24,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 10,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_REGFILE,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n \t.spec_operand = {\n \t\t(BNXT_ULP_REGFILE_INDEX_L2_CNTXT_ID_0 >> 8) & 0xff,\n \t\tBNXT_ULP_REGFILE_INDEX_L2_CNTXT_ID_0 & 0xff,\n@@ -1194,10 +1194,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 8,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_REGFILE,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n \t.spec_operand = {\n \t\t(BNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 >> 8) & 0xff,\n \t\tBNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 & 0xff,\n@@ -1206,10 +1206,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 8,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_HDR_FIELD,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n \t\t(BNXT_ULP_HF1_IDX_SVIF_INDEX >> 8) & 0xff,\n \t\tBNXT_ULP_HF1_IDX_SVIF_INDEX & 0xff,\n@@ -1218,10 +1218,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 4,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TUN_HDR_TYPE_NONE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1229,40 +1229,40 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 12,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 12,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 48,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 8,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_HDR_FIELD,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.mask_operand = {\n \t\t(BNXT_ULP_HF1_IDX_SVIF_INDEX >> 8) & 0xff,\n \t\tBNXT_ULP_HF1_IDX_SVIF_INDEX & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_HDR_FIELD,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n \t\t(BNXT_ULP_HF1_IDX_SVIF_INDEX >> 8) & 0xff,\n \t\tBNXT_ULP_HF1_IDX_SVIF_INDEX & 0xff,\n@@ -1271,64 +1271,64 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 4,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 12,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 12,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 48,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 2,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 2,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 4,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TUN_HDR_TYPE_NONE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1336,37 +1336,37 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 2,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 7,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_GLB_REGFILE,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_GLB_REGFILE,\n \t.spec_operand = {\n \t\t(BNXT_ULP_GLB_REGFILE_INDEX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n \t\tBNXT_ULP_GLB_REGFILE_INDEX_GLB_PROF_FUNC_ID & 0xff,\n@@ -1375,10 +1375,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 8,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_REGFILE,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n \t.spec_operand = {\n \t\t(BNXT_ULP_REGFILE_INDEX_CLASS_TID >> 8) & 0xff,\n \t\tBNXT_ULP_REGFILE_INDEX_CLASS_TID & 0xff,\n@@ -1387,10 +1387,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L4_HDR_IS_UDP_TCP_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1398,10 +1398,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 4,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L4_HDR_TYPE_UDP,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1409,10 +1409,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L4_HDR_ERROR_NO,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1420,10 +1420,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L4_HDR_VALID_YES,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1431,10 +1431,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L3_IPV6_CMP_DST_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1442,10 +1442,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L3_IPV6_CMP_SRC_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1453,10 +1453,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L3_HDR_ISIP_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1464,10 +1464,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 4,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L3_HDR_TYPE_IPV4,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1475,10 +1475,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L3_HDR_ERROR_NO,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1486,10 +1486,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L3_HDR_VALID_YES,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1497,10 +1497,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L2_TWO_VTAGS_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1508,10 +1508,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L2_VTAG_PRESENT_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1519,10 +1519,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 2,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L2_UC_MC_BC_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1530,10 +1530,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 2,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L2_HDR_TYPE_DIX,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1541,10 +1541,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L2_HDR_ERROR_NO,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1552,10 +1552,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L2_HDR_VALID_YES,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1563,10 +1563,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 3,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TUN_HDR_FLAGS_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1574,10 +1574,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 4,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TUN_HDR_TYPE_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1585,10 +1585,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TUN_HDR_ERROR_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1596,10 +1596,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TUN_HDR_VALID_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1607,10 +1607,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TL4_HDR_IS_UDP_TCP_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1618,10 +1618,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 4,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TL4_HDR_TYPE_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1629,10 +1629,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TL4_HDR_ERROR_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1640,10 +1640,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TL4_HDR_VALID_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1651,10 +1651,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TL3_IPV6_CMP_DST_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1662,10 +1662,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TL3_IPV6_CMP_SRC_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1673,10 +1673,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TL3_HDR_ISIP_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1684,10 +1684,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 4,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TL3_HDR_TYPE_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1695,10 +1695,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TL3_HDR_ERROR_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1706,10 +1706,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TL3_HDR_VALID_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1717,10 +1717,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TL2_TWO_VTAGS_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1728,10 +1728,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TL2_VTAG_PRESENT_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1739,10 +1739,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 2,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TL2_UC_MC_BC_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1750,10 +1750,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 2,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TL2_HDR_TYPE_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1761,10 +1761,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TL2_HDR_VALID_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1772,10 +1772,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_HREC_NEXT_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1783,10 +1783,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 9,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\t(BNXT_ULP_SYM_RESERVED_IGNORE >> 8) & 0xff,\n \t\tBNXT_ULP_SYM_RESERVED_IGNORE & 0xff,\n@@ -1795,10 +1795,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 7,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_GLB_REGFILE,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_GLB_REGFILE,\n \t.spec_operand = {\n \t\t(BNXT_ULP_GLB_REGFILE_INDEX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n \t\tBNXT_ULP_GLB_REGFILE_INDEX_GLB_PROF_FUNC_ID & 0xff,\n@@ -1807,10 +1807,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_AGG_ERROR_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1818,10 +1818,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 2,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_RECYCLE_CNT_ZERO,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1829,10 +1829,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 4,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_PKT_TYPE_L2,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1840,37 +1840,37 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 251,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_ADD_PAD,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_ADD_PAD,\n \t.spec_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 3,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 16,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_HDR_FIELD,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n \t\t(BNXT_ULP_HF1_IDX_O_UDP_DST_PORT >> 8) & 0xff,\n \t\tBNXT_ULP_HF1_IDX_O_UDP_DST_PORT & 0xff,\n@@ -1879,10 +1879,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 16,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_HDR_FIELD,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n \t\t(BNXT_ULP_HF1_IDX_O_UDP_SRC_PORT >> 8) & 0xff,\n \t\tBNXT_ULP_HF1_IDX_O_UDP_SRC_PORT & 0xff,\n@@ -1891,10 +1891,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 8,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_IP_PROTO_UDP,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1902,10 +1902,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 32,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_HDR_FIELD,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n \t\t(BNXT_ULP_HF1_IDX_O_IPV4_DST_ADDR >> 8) & 0xff,\n \t\tBNXT_ULP_HF1_IDX_O_IPV4_DST_ADDR & 0xff,\n@@ -1914,10 +1914,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 32,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_HDR_FIELD,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n \t\t(BNXT_ULP_HF1_IDX_O_IPV4_SRC_ADDR >> 8) & 0xff,\n \t\tBNXT_ULP_HF1_IDX_O_IPV4_SRC_ADDR & 0xff,\n@@ -1926,28 +1926,28 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 48,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 24,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 10,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_REGFILE,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n \t.spec_operand = {\n \t\t(BNXT_ULP_REGFILE_INDEX_L2_CNTXT_ID_0 >> 8) & 0xff,\n \t\tBNXT_ULP_REGFILE_INDEX_L2_CNTXT_ID_0 & 0xff,\n@@ -1956,10 +1956,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 8,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_REGFILE,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n \t.spec_operand = {\n \t\t(BNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 >> 8) & 0xff,\n \t\tBNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 & 0xff,\n@@ -1968,10 +1968,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 8,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_HDR_FIELD,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n \t\t(BNXT_ULP_HF2_IDX_SVIF_INDEX >> 8) & 0xff,\n \t\tBNXT_ULP_HF2_IDX_SVIF_INDEX & 0xff,\n@@ -1980,10 +1980,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 4,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TUN_HDR_TYPE_NONE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -1991,40 +1991,40 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 12,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 12,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 48,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 8,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_HDR_FIELD,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.mask_operand = {\n \t\t(BNXT_ULP_HF2_IDX_SVIF_INDEX >> 8) & 0xff,\n \t\tBNXT_ULP_HF2_IDX_SVIF_INDEX & 0xff,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_HDR_FIELD,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n \t\t(BNXT_ULP_HF2_IDX_SVIF_INDEX >> 8) & 0xff,\n \t\tBNXT_ULP_HF2_IDX_SVIF_INDEX & 0xff,\n@@ -2033,64 +2033,64 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 4,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 12,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 12,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 48,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 2,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 2,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 4,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TUN_HDR_TYPE_VXLAN,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -2098,37 +2098,37 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 2,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 7,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_GLB_REGFILE,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_GLB_REGFILE,\n \t.spec_operand = {\n \t\t(BNXT_ULP_GLB_REGFILE_INDEX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n \t\tBNXT_ULP_GLB_REGFILE_INDEX_GLB_PROF_FUNC_ID & 0xff,\n@@ -2137,10 +2137,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 8,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_REGFILE,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n \t.spec_operand = {\n \t\t(BNXT_ULP_REGFILE_INDEX_CLASS_TID >> 8) & 0xff,\n \t\tBNXT_ULP_REGFILE_INDEX_CLASS_TID & 0xff,\n@@ -2149,10 +2149,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L4_HDR_IS_UDP_TCP_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -2160,10 +2160,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 4,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L4_HDR_TYPE_UDP,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -2171,10 +2171,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L4_HDR_ERROR_NO,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -2182,10 +2182,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L4_HDR_VALID_YES,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -2193,10 +2193,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L3_IPV6_CMP_DST_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -2204,10 +2204,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L3_IPV6_CMP_SRC_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -2215,10 +2215,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L3_HDR_ISIP_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -2226,10 +2226,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 4,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L3_HDR_TYPE_IPV4,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -2237,10 +2237,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L3_HDR_ERROR_NO,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -2248,10 +2248,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L3_HDR_VALID_YES,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -2259,10 +2259,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L2_TWO_VTAGS_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -2270,10 +2270,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L2_VTAG_PRESENT_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -2281,10 +2281,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 2,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L2_UC_MC_BC_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -2292,10 +2292,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 2,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L2_HDR_TYPE_DIX,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -2303,10 +2303,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L2_HDR_ERROR_NO,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -2314,10 +2314,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_L2_HDR_VALID_YES,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -2325,10 +2325,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 3,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TUN_HDR_FLAGS_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -2336,10 +2336,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 4,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TUN_HDR_TYPE_VXLAN,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -2347,10 +2347,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TUN_HDR_ERROR_NO,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -2358,10 +2358,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TUN_HDR_VALID_YES,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -2369,10 +2369,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TL4_HDR_IS_UDP_TCP_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -2380,10 +2380,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 4,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TL4_HDR_TYPE_UDP,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -2391,10 +2391,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TL4_HDR_ERROR_NO,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -2402,10 +2402,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TL4_HDR_VALID_YES,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -2413,10 +2413,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TL3_IPV6_CMP_DST_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -2424,10 +2424,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TL3_IPV6_CMP_SRC_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -2435,10 +2435,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TL3_HDR_ISIP_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -2446,10 +2446,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 4,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TL3_HDR_TYPE_IPV4,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -2457,10 +2457,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TL3_HDR_ERROR_NO,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -2468,10 +2468,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TL3_HDR_VALID_YES,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -2479,10 +2479,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TL2_TWO_VTAGS_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -2490,10 +2490,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TL2_VTAG_PRESENT_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -2501,10 +2501,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 2,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TL2_UC_MC_BC_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -2512,10 +2512,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 2,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TL2_HDR_TYPE_DIX,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -2523,10 +2523,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_TL2_HDR_VALID_YES,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -2534,10 +2534,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_HREC_NEXT_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -2545,10 +2545,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 9,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\t(BNXT_ULP_SYM_RESERVED_IGNORE >> 8) & 0xff,\n \t\tBNXT_ULP_SYM_RESERVED_IGNORE & 0xff,\n@@ -2557,10 +2557,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 7,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_GLB_REGFILE,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_GLB_REGFILE,\n \t.spec_operand = {\n \t\t(BNXT_ULP_GLB_REGFILE_INDEX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n \t\tBNXT_ULP_GLB_REGFILE_INDEX_GLB_PROF_FUNC_ID & 0xff,\n@@ -2569,10 +2569,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_AGG_ERROR_IGNORE,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -2580,10 +2580,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 2,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_RECYCLE_CNT_ZERO,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -2591,10 +2591,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 4,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_PKT_TYPE_L2,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -2602,37 +2602,37 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\n \t\t0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 251,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_ADD_PAD,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_ADD_PAD,\n \t.spec_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 3,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 16,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_HDR_FIELD,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n \t\t(BNXT_ULP_HF2_IDX_I_UDP_DST_PORT >> 8) & 0xff,\n \t\tBNXT_ULP_HF2_IDX_I_UDP_DST_PORT & 0xff,\n@@ -2641,10 +2641,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 16,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_HDR_FIELD,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n \t\t(BNXT_ULP_HF2_IDX_I_UDP_SRC_PORT >> 8) & 0xff,\n \t\tBNXT_ULP_HF2_IDX_I_UDP_SRC_PORT & 0xff,\n@@ -2653,10 +2653,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 8,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {\n \t\tBNXT_ULP_SYM_IP_PROTO_UDP,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n@@ -2664,10 +2664,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 32,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_HDR_FIELD,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n \t\t(BNXT_ULP_HF2_IDX_I_IPV4_DST_ADDR >> 8) & 0xff,\n \t\tBNXT_ULP_HF2_IDX_I_IPV4_DST_ADDR & 0xff,\n@@ -2676,10 +2676,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 32,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_HDR_FIELD,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD,\n \t.spec_operand = {\n \t\t(BNXT_ULP_HF2_IDX_I_IPV4_SRC_ADDR >> 8) & 0xff,\n \t\tBNXT_ULP_HF2_IDX_I_IPV4_SRC_ADDR & 0xff,\n@@ -2688,28 +2688,28 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 48,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 24,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_CONSTANT,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.spec_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 10,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_REGFILE,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n \t.spec_operand = {\n \t\t(BNXT_ULP_REGFILE_INDEX_L2_CNTXT_ID_0 >> 8) & 0xff,\n \t\tBNXT_ULP_REGFILE_INDEX_L2_CNTXT_ID_0 & 0xff,\n@@ -2718,10 +2718,10 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 8,\n-\t.mask_opcode = BNXT_ULP_MASK_OPC_SET_TO_CONSTANT,\n+\t.mask_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.mask_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},\n-\t.spec_opcode = BNXT_ULP_SPEC_OPC_SET_TO_REGFILE,\n+\t.spec_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n \t.spec_operand = {\n \t\t(BNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 >> 8) & 0xff,\n \t\tBNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 & 0xff,\n@@ -2733,7 +2733,7 @@ struct bnxt_ulp_mapper_class_key_field_info ulp_class_key_field_list[] = {\n struct bnxt_ulp_mapper_result_field_info ulp_class_result_field_list[] = {\n \t{\n \t.field_bit_size = 10,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_REGFILE,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n \t.result_operand = {\n \t\t(BNXT_ULP_REGFILE_INDEX_L2_CNTXT_ID_0 >> 8) & 0xff,\n \t\tBNXT_ULP_REGFILE_INDEX_L2_CNTXT_ID_0 & 0xff,\n@@ -2742,7 +2742,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_class_result_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 10,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_REGFILE,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n \t.result_operand = {\n \t\t(BNXT_ULP_REGFILE_INDEX_L2_CNTXT_ID_0 >> 8) & 0xff,\n \t\tBNXT_ULP_REGFILE_INDEX_L2_CNTXT_ID_0 & 0xff,\n@@ -2751,7 +2751,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_class_result_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 7,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_GLB_REGFILE,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_GLB_REGFILE,\n \t.result_operand = {\n \t\t(BNXT_ULP_GLB_REGFILE_INDEX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n \t\tBNXT_ULP_GLB_REGFILE_INDEX_GLB_PROF_FUNC_ID & 0xff,\n@@ -2760,73 +2760,73 @@ struct bnxt_ulp_mapper_result_field_info ulp_class_result_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 4,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 8,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 3,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 6,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 3,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 16,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 2,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 2,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 10,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_REGFILE,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n \t.result_operand = {\n \t\t(BNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 >> 8) & 0xff,\n \t\tBNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 & 0xff,\n@@ -2835,25 +2835,25 @@ struct bnxt_ulp_mapper_result_field_info ulp_class_result_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 4,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 8,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 10,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {\n \t\t(0x00f9 >> 8) & 0xff,\n \t\t0x00f9 & 0xff,\n@@ -2862,13 +2862,13 @@ struct bnxt_ulp_mapper_result_field_info ulp_class_result_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 5,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x15, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 8,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_REGFILE,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n \t.result_operand = {\n \t\t(BNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 >> 8) & 0xff,\n \t\tBNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 & 0xff,\n@@ -2877,19 +2877,19 @@ struct bnxt_ulp_mapper_result_field_info ulp_class_result_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 33,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_REGFILE,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n \t.result_operand = {\n \t\t(BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR >> 8) & 0xff,\n \t\tBNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR & 0xff,\n@@ -2898,25 +2898,25 @@ struct bnxt_ulp_mapper_result_field_info ulp_class_result_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 5,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x02, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 9,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {\n \t\t(0x00c5 >> 8) & 0xff,\n \t\t0x00c5 & 0xff,\n@@ -2925,31 +2925,31 @@ struct bnxt_ulp_mapper_result_field_info ulp_class_result_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 11,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 2,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x03, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 10,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_REGFILE,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n \t.result_operand = {\n \t\t(BNXT_ULP_REGFILE_INDEX_L2_CNTXT_ID_0 >> 8) & 0xff,\n \t\tBNXT_ULP_REGFILE_INDEX_L2_CNTXT_ID_0 & 0xff,\n@@ -2958,7 +2958,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_class_result_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 10,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_REGFILE,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n \t.result_operand = {\n \t\t(BNXT_ULP_REGFILE_INDEX_L2_CNTXT_ID_0 >> 8) & 0xff,\n \t\tBNXT_ULP_REGFILE_INDEX_L2_CNTXT_ID_0 & 0xff,\n@@ -2967,7 +2967,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_class_result_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 7,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_GLB_REGFILE,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_GLB_REGFILE,\n \t.result_operand = {\n \t\t(BNXT_ULP_GLB_REGFILE_INDEX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n \t\tBNXT_ULP_GLB_REGFILE_INDEX_GLB_PROF_FUNC_ID & 0xff,\n@@ -2976,73 +2976,73 @@ struct bnxt_ulp_mapper_result_field_info ulp_class_result_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 4,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 8,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 3,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 6,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 3,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 16,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 2,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 2,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 10,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_REGFILE,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n \t.result_operand = {\n \t\t(BNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 >> 8) & 0xff,\n \t\tBNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 & 0xff,\n@@ -3051,25 +3051,25 @@ struct bnxt_ulp_mapper_result_field_info ulp_class_result_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 4,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 8,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 10,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {\n \t\t(0x00f9 >> 8) & 0xff,\n \t\t0x00f9 & 0xff,\n@@ -3078,13 +3078,13 @@ struct bnxt_ulp_mapper_result_field_info ulp_class_result_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 5,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x15, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 8,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_REGFILE,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n \t.result_operand = {\n \t\t(BNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 >> 8) & 0xff,\n \t\tBNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 & 0xff,\n@@ -3093,19 +3093,19 @@ struct bnxt_ulp_mapper_result_field_info ulp_class_result_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 33,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_REGFILE,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n \t.result_operand = {\n \t\t(BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR >> 8) & 0xff,\n \t\tBNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR & 0xff,\n@@ -3114,25 +3114,25 @@ struct bnxt_ulp_mapper_result_field_info ulp_class_result_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 5,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x02, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 9,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {\n \t\t(0x00c5 >> 8) & 0xff,\n \t\t0x00c5 & 0xff,\n@@ -3141,31 +3141,31 @@ struct bnxt_ulp_mapper_result_field_info ulp_class_result_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 11,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 2,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x03, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 10,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_REGFILE,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n \t.result_operand = {\n \t\t(BNXT_ULP_REGFILE_INDEX_L2_CNTXT_ID_0 >> 8) & 0xff,\n \t\tBNXT_ULP_REGFILE_INDEX_L2_CNTXT_ID_0 & 0xff,\n@@ -3174,7 +3174,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_class_result_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 10,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_REGFILE,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n \t.result_operand = {\n \t\t(BNXT_ULP_REGFILE_INDEX_L2_CNTXT_ID_0 >> 8) & 0xff,\n \t\tBNXT_ULP_REGFILE_INDEX_L2_CNTXT_ID_0 & 0xff,\n@@ -3183,7 +3183,7 @@ struct bnxt_ulp_mapper_result_field_info ulp_class_result_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 7,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_GLB_REGFILE,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_GLB_REGFILE,\n \t.result_operand = {\n \t\t(BNXT_ULP_GLB_REGFILE_INDEX_GLB_PROF_FUNC_ID >> 8) & 0xff,\n \t\tBNXT_ULP_GLB_REGFILE_INDEX_GLB_PROF_FUNC_ID & 0xff,\n@@ -3192,73 +3192,73 @@ struct bnxt_ulp_mapper_result_field_info ulp_class_result_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 4,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 8,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 3,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 6,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 3,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 16,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 2,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 2,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 10,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_REGFILE,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n \t.result_operand = {\n \t\t(BNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 >> 8) & 0xff,\n \t\tBNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 & 0xff,\n@@ -3267,25 +3267,25 @@ struct bnxt_ulp_mapper_result_field_info ulp_class_result_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 4,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 8,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 10,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {\n \t\t(0x00f9 >> 8) & 0xff,\n \t\t0x00f9 & 0xff,\n@@ -3294,13 +3294,13 @@ struct bnxt_ulp_mapper_result_field_info ulp_class_result_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 5,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x15, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 8,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_REGFILE,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n \t.result_operand = {\n \t\t(BNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 >> 8) & 0xff,\n \t\tBNXT_ULP_REGFILE_INDEX_EM_PROFILE_ID_0 & 0xff,\n@@ -3309,19 +3309,19 @@ struct bnxt_ulp_mapper_result_field_info ulp_class_result_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 33,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_REGFILE,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_REGFILE,\n \t.result_operand = {\n \t\t(BNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR >> 8) & 0xff,\n \t\tBNXT_ULP_REGFILE_INDEX_MAIN_ACTION_PTR & 0xff,\n@@ -3330,25 +3330,25 @@ struct bnxt_ulp_mapper_result_field_info ulp_class_result_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 5,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x02, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 9,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {\n \t\t(0x00c5 >> 8) & 0xff,\n \t\t0x00c5 & 0xff,\n@@ -3357,25 +3357,25 @@ struct bnxt_ulp_mapper_result_field_info ulp_class_result_field_list[] = {\n \t},\n \t{\n \t.field_bit_size = 11,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 2,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x03, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t},\n \t{\n \t.field_bit_size = 1,\n-\t.result_opcode = BNXT_ULP_RESULT_OPC_SET_TO_CONSTANT,\n+\t.result_opcode = BNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT,\n \t.result_operand = {0x01, 0x00, 0x00, 0x00, 0x00, 0x00,\n \t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\n \t}\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_template_db_enum.h b/drivers/net/bnxt/tf_ulp/ulp_template_db_enum.h\nindex 07a3c78..6c3e00c 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_template_db_enum.h\n+++ b/drivers/net/bnxt/tf_ulp/ulp_template_db_enum.h\n@@ -157,13 +157,17 @@ enum bnxt_ulp_mark_enable {\n \tBNXT_ULP_MARK_ENABLE_LAST = 2\n };\n \n-enum bnxt_ulp_mask_opc {\n-\tBNXT_ULP_MASK_OPC_SET_TO_CONSTANT = 0,\n-\tBNXT_ULP_MASK_OPC_SET_TO_HDR_FIELD = 1,\n-\tBNXT_ULP_MASK_OPC_SET_TO_REGFILE = 2,\n-\tBNXT_ULP_MASK_OPC_SET_TO_GLB_REGFILE = 3,\n-\tBNXT_ULP_MASK_OPC_ADD_PAD = 4,\n-\tBNXT_ULP_MASK_OPC_LAST = 5\n+enum bnxt_ulp_mapper_opc {\n+\tBNXT_ULP_MAPPER_OPC_SET_TO_CONSTANT = 0,\n+\tBNXT_ULP_MAPPER_OPC_SET_TO_HDR_FIELD = 1,\n+\tBNXT_ULP_MAPPER_OPC_SET_TO_COMP_FIELD = 2,\n+\tBNXT_ULP_MAPPER_OPC_SET_TO_REGFILE = 3,\n+\tBNXT_ULP_MAPPER_OPC_SET_TO_GLB_REGFILE = 4,\n+\tBNXT_ULP_MAPPER_OPC_ADD_PAD = 5,\n+\tBNXT_ULP_MAPPER_OPC_SET_TO_ACT_BIT = 6,\n+\tBNXT_ULP_MAPPER_OPC_SET_TO_ACT_PROP = 7,\n+\tBNXT_ULP_MAPPER_OPC_SET_TO_ENCAP_ACT_PROP_SZ = 8,\n+\tBNXT_ULP_MAPPER_OPC_LAST = 9\n };\n \n enum bnxt_ulp_match_type {\n@@ -204,33 +208,12 @@ enum bnxt_ulp_regfile_index {\n \tBNXT_ULP_REGFILE_INDEX_LAST = 15\n };\n \n-enum bnxt_ulp_result_opc {\n-\tBNXT_ULP_RESULT_OPC_SET_TO_CONSTANT = 0,\n-\tBNXT_ULP_RESULT_OPC_SET_TO_ACT_PROP = 1,\n-\tBNXT_ULP_RESULT_OPC_SET_TO_ACT_BIT = 2,\n-\tBNXT_ULP_RESULT_OPC_SET_TO_ENCAP_ACT_PROP_SZ = 3,\n-\tBNXT_ULP_RESULT_OPC_SET_TO_REGFILE = 4,\n-\tBNXT_ULP_RESULT_OPC_SET_TO_GLB_REGFILE = 5,\n-\tBNXT_ULP_RESULT_OPC_SET_TO_COMP_FIELD = 6,\n-\tBNXT_ULP_RESULT_OPC_LAST = 7\n-};\n-\n enum bnxt_ulp_search_before_alloc {\n \tBNXT_ULP_SEARCH_BEFORE_ALLOC_NO = 0,\n \tBNXT_ULP_SEARCH_BEFORE_ALLOC_YES = 1,\n \tBNXT_ULP_SEARCH_BEFORE_ALLOC_LAST = 2\n };\n \n-enum bnxt_ulp_spec_opc {\n-\tBNXT_ULP_SPEC_OPC_SET_TO_CONSTANT = 0,\n-\tBNXT_ULP_SPEC_OPC_SET_TO_HDR_FIELD = 1,\n-\tBNXT_ULP_SPEC_OPC_SET_TO_COMP_FIELD = 2,\n-\tBNXT_ULP_SPEC_OPC_SET_TO_REGFILE = 3,\n-\tBNXT_ULP_SPEC_OPC_SET_TO_GLB_REGFILE = 4,\n-\tBNXT_ULP_SPEC_OPC_ADD_PAD = 5,\n-\tBNXT_ULP_SPEC_OPC_LAST = 6\n-};\n-\n enum bnxt_ulp_vfr_flag {\n \tBNXT_ULP_VFR_FLAG_NO = 0,\n \tBNXT_ULP_VFR_FLAG_YES = 1,\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_template_struct.h b/drivers/net/bnxt/tf_ulp/ulp_template_struct.h\nindex 36bf5a4..8de6c4c 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_template_struct.h\n+++ b/drivers/net/bnxt/tf_ulp/ulp_template_struct.h\n@@ -187,17 +187,17 @@ struct bnxt_ulp_mapper_tbl_info {\n };\n \n struct bnxt_ulp_mapper_class_key_field_info {\n-\tuint8_t\t\t\tdescription[64];\n-\tenum bnxt_ulp_mask_opc\tmask_opcode;\n-\tenum bnxt_ulp_spec_opc\tspec_opcode;\n-\tuint16_t\t\tfield_bit_size;\n-\tuint8_t\t\t\tmask_operand[16];\n-\tuint8_t\t\t\tspec_operand[16];\n+\tuint8_t\t\t\t\tdescription[64];\n+\tenum bnxt_ulp_mapper_opc\tmask_opcode;\n+\tenum bnxt_ulp_mapper_opc\tspec_opcode;\n+\tuint16_t\t\t\tfield_bit_size;\n+\tuint8_t\t\t\t\tmask_operand[16];\n+\tuint8_t\t\t\t\tspec_operand[16];\n };\n \n struct bnxt_ulp_mapper_result_field_info {\n \tuint8_t\t\t\t\tdescription[64];\n-\tenum bnxt_ulp_result_opc\tresult_opcode;\n+\tenum bnxt_ulp_mapper_opc\tresult_opcode;\n \tuint16_t\t\t\tfield_bit_size;\n \tuint8_t\t\t\t\tresult_operand[16];\n };\n",
    "prefixes": [
        "30/36"
    ]
}