DPDK patches and discussions
 help / color / mirror / Atom feed
From: Sriharsha Basavapatna <sriharsha.basavapatna@broadcom.com>
To: dev@dpdk.org
Cc: Randy Schacher <stuart.schacher@broadcom.com>,
	Kishore Padmanabha <kishore.padmanabha@broadcom.com>,
	Sriharsha Basavapatna <sriharsha.basavapatna@broadcom.com>
Subject: [PATCH 12/47] net/bnxt: tf_ulp: add vxlan-gpe base support
Date: Fri, 30 Aug 2024 19:30:14 +0530	[thread overview]
Message-ID: <20240830140049.1715230-13-sriharsha.basavapatna@broadcom.com> (raw)
In-Reply-To: <20240830140049.1715230-1-sriharsha.basavapatna@broadcom.com>

From: Randy Schacher <stuart.schacher@broadcom.com>

- Adds vxlan-gpe into ulp layer
- Adds vxlan-gpe into template infrastructure

This patch also updates the template files for the following
tf_ulp patches in this series.

net/bnxt: tf_ulp: add vxlan-gpe base support
net/bnxt: tf_ulp: add custom l2 etype tunnel support
net/bnxt: tf_ulp: add support for vf to vf flow offload
net/bnxt: tf_ulp: support Wh+ mirroring
net/bnxt: tf_ulp: miscellaneous fixes

Signed-off-by: Randy Schacher <stuart.schacher@broadcom.com>
Reviewed-by: Kishore Padmanabha <kishore.padmanabha@broadcom.com>
Signed-off-by: Sriharsha Basavapatna <sriharsha.basavapatna@broadcom.com>
---
 drivers/net/bnxt/tf_ulp/bnxt_tf_pmd_shim.c    |     5 +-
 drivers/net/bnxt/tf_ulp/bnxt_tf_pmd_shim.h    |     1 +
 drivers/net/bnxt/tf_ulp/bnxt_ulp.c            |    11 +
 drivers/net/bnxt/tf_ulp/bnxt_ulp.h            |     6 +
 .../generic_templates/ulp_template_db_act.c   |  7610 ++++--
 .../generic_templates/ulp_template_db_class.c | 21075 ++++++++--------
 .../generic_templates/ulp_template_db_enum.h  |  1551 +-
 .../generic_templates/ulp_template_db_field.h |  1625 +-
 .../generic_templates/ulp_template_db_tbl.c   | 17850 ++-----------
 .../generic_templates/ulp_template_db_tbl.h   |     2 +
 .../ulp_template_db_thor_act.c                |  1171 +-
 .../ulp_template_db_thor_class.c              |   237 +-
 .../ulp_template_db_wh_plus_act.c             | 11243 +++++++--
 .../ulp_template_db_wh_plus_class.c           |  4254 +++-
 drivers/net/bnxt/tf_ulp/ulp_mapper.c          |    42 +-
 drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c |     4 +-
 drivers/net/bnxt/tf_ulp/ulp_rte_parser.c      |    78 +-
 drivers/net/bnxt/tf_ulp/ulp_rte_parser.h      |     5 +
 drivers/net/bnxt/tf_ulp/ulp_template_struct.h |     2 +
 19 files changed, 31529 insertions(+), 35243 deletions(-)

diff --git a/drivers/net/bnxt/tf_ulp/bnxt_tf_pmd_shim.c b/drivers/net/bnxt/tf_ulp/bnxt_tf_pmd_shim.c
index 7e4952c062..758dffde22 100644
--- a/drivers/net/bnxt/tf_ulp/bnxt_tf_pmd_shim.c
+++ b/drivers/net/bnxt/tf_ulp/bnxt_tf_pmd_shim.c
@@ -554,12 +554,15 @@ bnxt_pmd_global_tunnel_set(uint16_t port_id, uint8_t type,
 	case BNXT_GLOBAL_REGISTER_TUNNEL_ECPRI:
 		hwtype = HWRM_TUNNEL_DST_PORT_ALLOC_INPUT_TUNNEL_TYPE_ECPRI;
 		break;
+	case BNXT_GLOBAL_REGISTER_TUNNEL_VXLAN_GPE:
+		hwtype = HWRM_TUNNEL_DST_PORT_ALLOC_INPUT_TUNNEL_TYPE_VXLAN_GPE;
+		break;
 	default:
 		BNXT_TF_DBG(ERR, "Tunnel Type (%d) invalid\n", type);
 		return -EINVAL;
 	}
 
-	if (!udp_port && type != BNXT_GLOBAL_REGISTER_TUNNEL_ECPRI) {
+	if (!udp_port) {
 		/* Free based on the handle */
 		if (!handle) {
 			BNXT_TF_DBG(ERR, "Free with invalid handle\n");
diff --git a/drivers/net/bnxt/tf_ulp/bnxt_tf_pmd_shim.h b/drivers/net/bnxt/tf_ulp/bnxt_tf_pmd_shim.h
index 18feab6cac..84e395c9df 100644
--- a/drivers/net/bnxt/tf_ulp/bnxt_tf_pmd_shim.h
+++ b/drivers/net/bnxt/tf_ulp/bnxt_tf_pmd_shim.h
@@ -20,6 +20,7 @@ enum bnxt_global_register_tunnel_type {
 	BNXT_GLOBAL_REGISTER_TUNNEL_UNUSED = 0,
 	BNXT_GLOBAL_REGISTER_TUNNEL_VXLAN,
 	BNXT_GLOBAL_REGISTER_TUNNEL_ECPRI,
+	BNXT_GLOBAL_REGISTER_TUNNEL_VXLAN_GPE,
 	BNXT_GLOBAL_REGISTER_TUNNEL_MAX
 };
 
diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c
index 33028c470f..96a5353aaf 100644
--- a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c
+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c
@@ -469,6 +469,7 @@ bnxt_ulp_cntxt_app_caps_init(struct bnxt *bp,
 		bnxt_ulp_ha_reg_set(ulp_ctx, info[i].ha_reg_state,
 				    info[i].ha_reg_cnt);
 		ulp_ctx->cfg_data->ha_pool_id = info[i].ha_pool_id;
+		ulp_ctx->cfg_data->default_priority = info[i].default_priority;
 	}
 	if (!found) {
 		BNXT_TF_DBG(ERR, "APP ID %d, Device ID: 0x%x not supported.\n",
@@ -549,6 +550,16 @@ bnxt_ulp_vxlan_port_get(struct bnxt_ulp_context *ulp_ctx)
 	return (unsigned int)ulp_ctx->cfg_data->vxlan_port;
 }
 
+/* Function to retrieve the default app priority from the context. */
+unsigned int
+bnxt_ulp_default_app_priority_get(struct bnxt_ulp_context *ulp_ctx)
+{
+	if (!ulp_ctx || !ulp_ctx->cfg_data)
+		return 0;
+
+	return (unsigned int)ulp_ctx->cfg_data->default_priority;
+}
+
 static inline uint32_t
 bnxt_ulp_session_idx_get(enum bnxt_ulp_session_type session_type) {
 	if (session_type & BNXT_ULP_SESSION_TYPE_SHARED)
diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp.h b/drivers/net/bnxt/tf_ulp/bnxt_ulp.h
index 258801f633..d42382d947 100644
--- a/drivers/net/bnxt/tf_ulp/bnxt_ulp.h
+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp.h
@@ -58,6 +58,7 @@
 					BNXT_ULP_APP_HA_DYNAMIC)
 
 #define ULP_APP_CUST_VXLAN_SUPPORT(ctx)	   ((ctx)->cfg_data->vxlan_port != 0)
+#define ULP_APP_VXLAN_GPE_SUPPORT(ctx)     ((ctx)->cfg_data->vxlan_gpe_port != 0)
 #define ULP_APP_CUST_VXLAN_IP_SUPPORT(ctx) ((ctx)->cfg_data->vxlan_ip_port != 0)
 
 enum bnxt_ulp_flow_mem_type {
@@ -111,7 +112,9 @@ struct bnxt_ulp_data {
 	uint8_t				app_id;
 	uint8_t				num_shared_clients;
 	struct bnxt_flow_app_tun_ent	app_tun[BNXT_ULP_MAX_TUN_CACHE_ENTRIES];
+	uint32_t			default_priority;
 	uint32_t			vxlan_port;
+	uint32_t			vxlan_gpe_port;
 	uint32_t			vxlan_ip_port;
 	uint32_t			ecpri_udp_port;
 	uint8_t				hu_reg_state;
@@ -369,6 +372,9 @@ bnxt_ulp_vxlan_port_set(struct bnxt_ulp_context *ulp_ctx,
 unsigned int
 bnxt_ulp_vxlan_port_get(struct bnxt_ulp_context *ulp_ctx);
 
+unsigned int
+bnxt_ulp_default_app_priority_get(struct bnxt_ulp_context *ulp_ctx);
+
 int
 bnxt_ulp_vxlan_ip_port_set(struct bnxt_ulp_context *ulp_ctx,
 			   uint32_t vxlan_ip_port);
diff --git a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_act.c b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_act.c
index 7f1eba369e..fad593fa24 100644
--- a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_act.c
+++ b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_act.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2014-2023 Broadcom
+ * Copyright(c) 2014-2024 Broadcom
  * All rights reserved.
  */
 
@@ -14,550 +14,728 @@
  */
 uint16_t ulp_act_sig_tbl[BNXT_ULP_ACT_SIG_TBL_MAX_SZ] = {
 	[BNXT_ULP_ACT_HID_0000] = 1,
-	[BNXT_ULP_ACT_HID_0008] = 2,
-	[BNXT_ULP_ACT_HID_2000] = 3,
-	[BNXT_ULP_ACT_HID_1988] = 4,
-	[BNXT_ULP_ACT_HID_0080] = 5,
-	[BNXT_ULP_ACT_HID_3988] = 6,
-	[BNXT_ULP_ACT_HID_1a08] = 7,
-	[BNXT_ULP_ACT_HID_0010] = 8,
-	[BNXT_ULP_ACT_HID_0040] = 9,
-	[BNXT_ULP_ACT_HID_0050] = 10,
-	[BNXT_ULP_ACT_HID_0018] = 11,
-	[BNXT_ULP_ACT_HID_2010] = 12,
-	[BNXT_ULP_ACT_HID_1998] = 13,
-	[BNXT_ULP_ACT_HID_0090] = 14,
-	[BNXT_ULP_ACT_HID_3998] = 15,
-	[BNXT_ULP_ACT_HID_1a18] = 16,
-	[BNXT_ULP_ACT_HID_32ea] = 17,
-	[BNXT_ULP_ACT_HID_32f2] = 18,
-	[BNXT_ULP_ACT_HID_52ea] = 19,
-	[BNXT_ULP_ACT_HID_4c72] = 20,
-	[BNXT_ULP_ACT_HID_336a] = 21,
-	[BNXT_ULP_ACT_HID_6c72] = 22,
-	[BNXT_ULP_ACT_HID_4cf2] = 23,
-	[BNXT_ULP_ACT_HID_32fa] = 24,
-	[BNXT_ULP_ACT_HID_3302] = 25,
-	[BNXT_ULP_ACT_HID_52fa] = 26,
-	[BNXT_ULP_ACT_HID_4c82] = 27,
-	[BNXT_ULP_ACT_HID_337a] = 28,
-	[BNXT_ULP_ACT_HID_6c82] = 29,
-	[BNXT_ULP_ACT_HID_4d02] = 30,
-	[BNXT_ULP_ACT_HID_0808] = 31,
-	[BNXT_ULP_ACT_HID_1008] = 32,
-	[BNXT_ULP_ACT_HID_1808] = 33,
-	[BNXT_ULP_ACT_HID_0818] = 34,
-	[BNXT_ULP_ACT_HID_1018] = 35,
-	[BNXT_ULP_ACT_HID_1818] = 36,
-	[BNXT_ULP_ACT_HID_0880] = 37,
-	[BNXT_ULP_ACT_HID_1080] = 38,
-	[BNXT_ULP_ACT_HID_1880] = 39,
-	[BNXT_ULP_ACT_HID_0890] = 40,
-	[BNXT_ULP_ACT_HID_1090] = 41,
-	[BNXT_ULP_ACT_HID_1890] = 42,
-	[BNXT_ULP_ACT_HID_3af2] = 43,
-	[BNXT_ULP_ACT_HID_42f2] = 44,
-	[BNXT_ULP_ACT_HID_4af2] = 45,
-	[BNXT_ULP_ACT_HID_3b02] = 46,
-	[BNXT_ULP_ACT_HID_4302] = 47,
-	[BNXT_ULP_ACT_HID_4b02] = 48,
-	[BNXT_ULP_ACT_HID_3b6a] = 49,
-	[BNXT_ULP_ACT_HID_436a] = 50,
-	[BNXT_ULP_ACT_HID_4b6a] = 51,
-	[BNXT_ULP_ACT_HID_3b7a] = 52,
-	[BNXT_ULP_ACT_HID_437a] = 53,
-	[BNXT_ULP_ACT_HID_4b7a] = 54,
-	[BNXT_ULP_ACT_HID_640d] = 55,
-	[BNXT_ULP_ACT_HID_641d] = 56,
-	[BNXT_ULP_ACT_HID_071a] = 57,
-	[BNXT_ULP_ACT_HID_0800] = 58,
-	[BNXT_ULP_ACT_HID_1000] = 59,
-	[BNXT_ULP_ACT_HID_1800] = 60,
-	[BNXT_ULP_ACT_HID_0810] = 61,
-	[BNXT_ULP_ACT_HID_1010] = 62,
-	[BNXT_ULP_ACT_HID_1810] = 63,
-	[BNXT_ULP_ACT_HID_1110] = 64,
-	[BNXT_ULP_ACT_HID_4420] = 65,
-	[BNXT_ULP_ACT_HID_2220] = 66,
-	[BNXT_ULP_ACT_HID_0c84] = 67,
-	[BNXT_ULP_ACT_HID_3f94] = 68,
-	[BNXT_ULP_ACT_HID_3330] = 69,
-	[BNXT_ULP_ACT_HID_50a4] = 70,
-	[BNXT_ULP_ACT_HID_1910] = 71,
-	[BNXT_ULP_ACT_HID_4c20] = 72,
-	[BNXT_ULP_ACT_HID_2a20] = 73,
-	[BNXT_ULP_ACT_HID_1484] = 74,
-	[BNXT_ULP_ACT_HID_4794] = 75,
-	[BNXT_ULP_ACT_HID_3b30] = 76,
-	[BNXT_ULP_ACT_HID_58a4] = 77,
-	[BNXT_ULP_ACT_HID_2110] = 78,
-	[BNXT_ULP_ACT_HID_5420] = 79,
-	[BNXT_ULP_ACT_HID_3220] = 80,
-	[BNXT_ULP_ACT_HID_1c84] = 81,
-	[BNXT_ULP_ACT_HID_4f94] = 82,
-	[BNXT_ULP_ACT_HID_4330] = 83,
-	[BNXT_ULP_ACT_HID_60a4] = 84,
-	[BNXT_ULP_ACT_HID_2910] = 85,
-	[BNXT_ULP_ACT_HID_5c20] = 86,
-	[BNXT_ULP_ACT_HID_3a20] = 87,
-	[BNXT_ULP_ACT_HID_2484] = 88,
-	[BNXT_ULP_ACT_HID_5794] = 89,
-	[BNXT_ULP_ACT_HID_4b30] = 90,
-	[BNXT_ULP_ACT_HID_68a4] = 91,
-	[BNXT_ULP_ACT_HID_1120] = 92,
-	[BNXT_ULP_ACT_HID_4430] = 93,
-	[BNXT_ULP_ACT_HID_2230] = 94,
-	[BNXT_ULP_ACT_HID_0c94] = 95,
-	[BNXT_ULP_ACT_HID_3fa4] = 96,
-	[BNXT_ULP_ACT_HID_3340] = 97,
-	[BNXT_ULP_ACT_HID_50b4] = 98,
-	[BNXT_ULP_ACT_HID_1920] = 99,
-	[BNXT_ULP_ACT_HID_4c30] = 100,
-	[BNXT_ULP_ACT_HID_2a30] = 101,
-	[BNXT_ULP_ACT_HID_1494] = 102,
-	[BNXT_ULP_ACT_HID_47a4] = 103,
-	[BNXT_ULP_ACT_HID_3b40] = 104,
-	[BNXT_ULP_ACT_HID_58b4] = 105,
-	[BNXT_ULP_ACT_HID_2120] = 106,
-	[BNXT_ULP_ACT_HID_5430] = 107,
-	[BNXT_ULP_ACT_HID_3230] = 108,
-	[BNXT_ULP_ACT_HID_1c94] = 109,
-	[BNXT_ULP_ACT_HID_4fa4] = 110,
-	[BNXT_ULP_ACT_HID_4340] = 111,
-	[BNXT_ULP_ACT_HID_60b4] = 112,
-	[BNXT_ULP_ACT_HID_2920] = 113,
-	[BNXT_ULP_ACT_HID_5c30] = 114,
-	[BNXT_ULP_ACT_HID_3a30] = 115,
-	[BNXT_ULP_ACT_HID_2494] = 116,
-	[BNXT_ULP_ACT_HID_57a4] = 117,
-	[BNXT_ULP_ACT_HID_4b40] = 118,
-	[BNXT_ULP_ACT_HID_68b4] = 119,
-	[BNXT_ULP_ACT_HID_2a98] = 120,
-	[BNXT_ULP_ACT_HID_5da8] = 121,
-	[BNXT_ULP_ACT_HID_3ba8] = 122,
-	[BNXT_ULP_ACT_HID_260c] = 123,
-	[BNXT_ULP_ACT_HID_591c] = 124,
-	[BNXT_ULP_ACT_HID_6a2c] = 125,
-	[BNXT_ULP_ACT_HID_2aa8] = 126,
-	[BNXT_ULP_ACT_HID_5db8] = 127,
-	[BNXT_ULP_ACT_HID_3bb8] = 128,
-	[BNXT_ULP_ACT_HID_261c] = 129,
-	[BNXT_ULP_ACT_HID_592c] = 130,
-	[BNXT_ULP_ACT_HID_6a3c] = 131,
-	[BNXT_ULP_ACT_HID_3298] = 132,
-	[BNXT_ULP_ACT_HID_65a8] = 133,
-	[BNXT_ULP_ACT_HID_43a8] = 134,
-	[BNXT_ULP_ACT_HID_2e0c] = 135,
-	[BNXT_ULP_ACT_HID_611c] = 136,
-	[BNXT_ULP_ACT_HID_722c] = 137,
-	[BNXT_ULP_ACT_HID_32a8] = 138,
-	[BNXT_ULP_ACT_HID_65b8] = 139,
-	[BNXT_ULP_ACT_HID_43b8] = 140,
-	[BNXT_ULP_ACT_HID_2e1c] = 141,
-	[BNXT_ULP_ACT_HID_612c] = 142,
-	[BNXT_ULP_ACT_HID_723c] = 143,
-	[BNXT_ULP_ACT_HID_3a98] = 144,
-	[BNXT_ULP_ACT_HID_6da8] = 145,
-	[BNXT_ULP_ACT_HID_4ba8] = 146,
-	[BNXT_ULP_ACT_HID_360c] = 147,
-	[BNXT_ULP_ACT_HID_691c] = 148,
-	[BNXT_ULP_ACT_HID_7a2c] = 149,
-	[BNXT_ULP_ACT_HID_3aa8] = 150,
-	[BNXT_ULP_ACT_HID_6db8] = 151,
-	[BNXT_ULP_ACT_HID_4bb8] = 152,
-	[BNXT_ULP_ACT_HID_361c] = 153,
-	[BNXT_ULP_ACT_HID_692c] = 154,
-	[BNXT_ULP_ACT_HID_7a3c] = 155,
-	[BNXT_ULP_ACT_HID_4298] = 156,
-	[BNXT_ULP_ACT_HID_75a8] = 157,
-	[BNXT_ULP_ACT_HID_53a8] = 158,
-	[BNXT_ULP_ACT_HID_3e0c] = 159,
-	[BNXT_ULP_ACT_HID_711c] = 160,
-	[BNXT_ULP_ACT_HID_0670] = 161,
-	[BNXT_ULP_ACT_HID_42a8] = 162,
-	[BNXT_ULP_ACT_HID_75b8] = 163,
-	[BNXT_ULP_ACT_HID_53b8] = 164,
-	[BNXT_ULP_ACT_HID_3e1c] = 165,
-	[BNXT_ULP_ACT_HID_712c] = 166,
-	[BNXT_ULP_ACT_HID_0680] = 167,
-	[BNXT_ULP_ACT_HID_3aea] = 168,
-	[BNXT_ULP_ACT_HID_42ea] = 169,
-	[BNXT_ULP_ACT_HID_4aea] = 170,
-	[BNXT_ULP_ACT_HID_3afa] = 171,
-	[BNXT_ULP_ACT_HID_42fa] = 172,
-	[BNXT_ULP_ACT_HID_4afa] = 173,
-	[BNXT_ULP_ACT_HID_43fa] = 174,
-	[BNXT_ULP_ACT_HID_770a] = 175,
-	[BNXT_ULP_ACT_HID_550a] = 176,
-	[BNXT_ULP_ACT_HID_3f6e] = 177,
-	[BNXT_ULP_ACT_HID_727e] = 178,
-	[BNXT_ULP_ACT_HID_661a] = 179,
-	[BNXT_ULP_ACT_HID_07d2] = 180,
-	[BNXT_ULP_ACT_HID_4bfa] = 181,
-	[BNXT_ULP_ACT_HID_034e] = 182,
-	[BNXT_ULP_ACT_HID_5d0a] = 183,
-	[BNXT_ULP_ACT_HID_476e] = 184,
-	[BNXT_ULP_ACT_HID_7a7e] = 185,
-	[BNXT_ULP_ACT_HID_6e1a] = 186,
-	[BNXT_ULP_ACT_HID_0fd2] = 187,
-	[BNXT_ULP_ACT_HID_53fa] = 188,
-	[BNXT_ULP_ACT_HID_0b4e] = 189,
-	[BNXT_ULP_ACT_HID_650a] = 190,
-	[BNXT_ULP_ACT_HID_4f6e] = 191,
-	[BNXT_ULP_ACT_HID_06c2] = 192,
-	[BNXT_ULP_ACT_HID_761a] = 193,
-	[BNXT_ULP_ACT_HID_17d2] = 194,
-	[BNXT_ULP_ACT_HID_5bfa] = 195,
-	[BNXT_ULP_ACT_HID_134e] = 196,
-	[BNXT_ULP_ACT_HID_6d0a] = 197,
-	[BNXT_ULP_ACT_HID_576e] = 198,
-	[BNXT_ULP_ACT_HID_0ec2] = 199,
-	[BNXT_ULP_ACT_HID_025e] = 200,
-	[BNXT_ULP_ACT_HID_1fd2] = 201,
-	[BNXT_ULP_ACT_HID_440a] = 202,
-	[BNXT_ULP_ACT_HID_771a] = 203,
-	[BNXT_ULP_ACT_HID_551a] = 204,
-	[BNXT_ULP_ACT_HID_3f7e] = 205,
-	[BNXT_ULP_ACT_HID_728e] = 206,
-	[BNXT_ULP_ACT_HID_662a] = 207,
-	[BNXT_ULP_ACT_HID_07e2] = 208,
-	[BNXT_ULP_ACT_HID_4c0a] = 209,
-	[BNXT_ULP_ACT_HID_035e] = 210,
-	[BNXT_ULP_ACT_HID_5d1a] = 211,
-	[BNXT_ULP_ACT_HID_477e] = 212,
-	[BNXT_ULP_ACT_HID_7a8e] = 213,
-	[BNXT_ULP_ACT_HID_6e2a] = 214,
-	[BNXT_ULP_ACT_HID_0fe2] = 215,
-	[BNXT_ULP_ACT_HID_540a] = 216,
-	[BNXT_ULP_ACT_HID_0b5e] = 217,
-	[BNXT_ULP_ACT_HID_651a] = 218,
-	[BNXT_ULP_ACT_HID_4f7e] = 219,
-	[BNXT_ULP_ACT_HID_06d2] = 220,
-	[BNXT_ULP_ACT_HID_762a] = 221,
-	[BNXT_ULP_ACT_HID_17e2] = 222,
-	[BNXT_ULP_ACT_HID_5c0a] = 223,
-	[BNXT_ULP_ACT_HID_135e] = 224,
-	[BNXT_ULP_ACT_HID_6d1a] = 225,
-	[BNXT_ULP_ACT_HID_577e] = 226,
-	[BNXT_ULP_ACT_HID_0ed2] = 227,
-	[BNXT_ULP_ACT_HID_026e] = 228,
-	[BNXT_ULP_ACT_HID_1fe2] = 229,
-	[BNXT_ULP_ACT_HID_5d82] = 230,
-	[BNXT_ULP_ACT_HID_14d6] = 231,
-	[BNXT_ULP_ACT_HID_6e92] = 232,
-	[BNXT_ULP_ACT_HID_58f6] = 233,
-	[BNXT_ULP_ACT_HID_104a] = 234,
-	[BNXT_ULP_ACT_HID_215a] = 235,
-	[BNXT_ULP_ACT_HID_5d92] = 236,
-	[BNXT_ULP_ACT_HID_14e6] = 237,
-	[BNXT_ULP_ACT_HID_6ea2] = 238,
-	[BNXT_ULP_ACT_HID_5906] = 239,
-	[BNXT_ULP_ACT_HID_105a] = 240,
-	[BNXT_ULP_ACT_HID_216a] = 241,
-	[BNXT_ULP_ACT_HID_6582] = 242,
-	[BNXT_ULP_ACT_HID_1cd6] = 243,
-	[BNXT_ULP_ACT_HID_7692] = 244,
-	[BNXT_ULP_ACT_HID_60f6] = 245,
-	[BNXT_ULP_ACT_HID_184a] = 246,
-	[BNXT_ULP_ACT_HID_295a] = 247,
-	[BNXT_ULP_ACT_HID_6592] = 248,
-	[BNXT_ULP_ACT_HID_1ce6] = 249,
-	[BNXT_ULP_ACT_HID_76a2] = 250,
-	[BNXT_ULP_ACT_HID_6106] = 251,
-	[BNXT_ULP_ACT_HID_185a] = 252,
-	[BNXT_ULP_ACT_HID_296a] = 253,
-	[BNXT_ULP_ACT_HID_6d82] = 254,
-	[BNXT_ULP_ACT_HID_24d6] = 255,
-	[BNXT_ULP_ACT_HID_02d6] = 256,
-	[BNXT_ULP_ACT_HID_68f6] = 257,
-	[BNXT_ULP_ACT_HID_204a] = 258,
-	[BNXT_ULP_ACT_HID_315a] = 259,
-	[BNXT_ULP_ACT_HID_6d92] = 260,
-	[BNXT_ULP_ACT_HID_24e6] = 261,
-	[BNXT_ULP_ACT_HID_02e6] = 262,
-	[BNXT_ULP_ACT_HID_6906] = 263,
-	[BNXT_ULP_ACT_HID_205a] = 264,
-	[BNXT_ULP_ACT_HID_316a] = 265,
-	[BNXT_ULP_ACT_HID_7582] = 266,
-	[BNXT_ULP_ACT_HID_2cd6] = 267,
-	[BNXT_ULP_ACT_HID_0ad6] = 268,
-	[BNXT_ULP_ACT_HID_70f6] = 269,
-	[BNXT_ULP_ACT_HID_284a] = 270,
-	[BNXT_ULP_ACT_HID_395a] = 271,
-	[BNXT_ULP_ACT_HID_7592] = 272,
-	[BNXT_ULP_ACT_HID_2ce6] = 273,
-	[BNXT_ULP_ACT_HID_0ae6] = 274,
-	[BNXT_ULP_ACT_HID_7106] = 275,
-	[BNXT_ULP_ACT_HID_285a] = 276,
-	[BNXT_ULP_ACT_HID_396a] = 277,
-	[BNXT_ULP_ACT_HID_0020] = 278,
-	[BNXT_ULP_ACT_HID_0030] = 279,
-	[BNXT_ULP_ACT_HID_65d4] = 280,
-	[BNXT_ULP_ACT_HID_65e4] = 281,
-	[BNXT_ULP_ACT_HID_330a] = 282,
-	[BNXT_ULP_ACT_HID_331a] = 283,
-	[BNXT_ULP_ACT_HID_1cfe] = 284,
-	[BNXT_ULP_ACT_HID_1d0e] = 285,
-	[BNXT_ULP_ACT_HID_1474] = 286,
-	[BNXT_ULP_ACT_HID_4838] = 287,
-	[BNXT_ULP_ACT_HID_6458] = 288,
-	[BNXT_ULP_ACT_HID_1c68] = 289,
-	[BNXT_ULP_ACT_HID_6c34] = 290,
-	[BNXT_ULP_ACT_HID_5d08] = 291,
-	[BNXT_ULP_ACT_HID_5d10] = 292,
-	[BNXT_ULP_ACT_HID_5d20] = 293,
-	[BNXT_ULP_ACT_HID_2e18] = 294,
-	[BNXT_ULP_ACT_HID_29d4] = 295,
-	[BNXT_ULP_ACT_HID_7690] = 296,
-	[BNXT_ULP_ACT_HID_47a0] = 297,
-	[BNXT_ULP_ACT_HID_435c] = 298,
-	[BNXT_ULP_ACT_HID_5d18] = 299,
-	[BNXT_ULP_ACT_HID_2e28] = 300,
-	[BNXT_ULP_ACT_HID_29e4] = 301,
-	[BNXT_ULP_ACT_HID_76a0] = 302,
-	[BNXT_ULP_ACT_HID_47b0] = 303,
-	[BNXT_ULP_ACT_HID_436c] = 304,
-	[BNXT_ULP_ACT_HID_1436] = 305,
-	[BNXT_ULP_ACT_HID_143e] = 306,
-	[BNXT_ULP_ACT_HID_144e] = 307,
-	[BNXT_ULP_ACT_HID_6102] = 308,
-	[BNXT_ULP_ACT_HID_5cbe] = 309,
-	[BNXT_ULP_ACT_HID_2dbe] = 310,
-	[BNXT_ULP_ACT_HID_7a8a] = 311,
-	[BNXT_ULP_ACT_HID_7646] = 312,
-	[BNXT_ULP_ACT_HID_1446] = 313,
-	[BNXT_ULP_ACT_HID_6112] = 314,
-	[BNXT_ULP_ACT_HID_5cce] = 315,
-	[BNXT_ULP_ACT_HID_2dce] = 316,
-	[BNXT_ULP_ACT_HID_7a9a] = 317,
-	[BNXT_ULP_ACT_HID_7656] = 318,
-	[BNXT_ULP_ACT_HID_6508] = 319,
-	[BNXT_ULP_ACT_HID_6d08] = 320,
-	[BNXT_ULP_ACT_HID_7508] = 321,
-	[BNXT_ULP_ACT_HID_6518] = 322,
-	[BNXT_ULP_ACT_HID_6d18] = 323,
-	[BNXT_ULP_ACT_HID_7518] = 324,
-	[BNXT_ULP_ACT_HID_6e18] = 325,
-	[BNXT_ULP_ACT_HID_256c] = 326,
-	[BNXT_ULP_ACT_HID_036c] = 327,
-	[BNXT_ULP_ACT_HID_698c] = 328,
-	[BNXT_ULP_ACT_HID_20e0] = 329,
-	[BNXT_ULP_ACT_HID_31f0] = 330,
-	[BNXT_ULP_ACT_HID_7618] = 331,
-	[BNXT_ULP_ACT_HID_2d6c] = 332,
-	[BNXT_ULP_ACT_HID_0b6c] = 333,
-	[BNXT_ULP_ACT_HID_718c] = 334,
-	[BNXT_ULP_ACT_HID_28e0] = 335,
-	[BNXT_ULP_ACT_HID_39f0] = 336,
-	[BNXT_ULP_ACT_HID_025c] = 337,
-	[BNXT_ULP_ACT_HID_356c] = 338,
-	[BNXT_ULP_ACT_HID_136c] = 339,
-	[BNXT_ULP_ACT_HID_798c] = 340,
-	[BNXT_ULP_ACT_HID_30e0] = 341,
-	[BNXT_ULP_ACT_HID_41f0] = 342,
-	[BNXT_ULP_ACT_HID_0a5c] = 343,
-	[BNXT_ULP_ACT_HID_3d6c] = 344,
-	[BNXT_ULP_ACT_HID_1b6c] = 345,
-	[BNXT_ULP_ACT_HID_05d0] = 346,
-	[BNXT_ULP_ACT_HID_38e0] = 347,
-	[BNXT_ULP_ACT_HID_49f0] = 348,
-	[BNXT_ULP_ACT_HID_6e28] = 349,
-	[BNXT_ULP_ACT_HID_257c] = 350,
-	[BNXT_ULP_ACT_HID_037c] = 351,
-	[BNXT_ULP_ACT_HID_699c] = 352,
-	[BNXT_ULP_ACT_HID_20f0] = 353,
-	[BNXT_ULP_ACT_HID_3200] = 354,
-	[BNXT_ULP_ACT_HID_7628] = 355,
-	[BNXT_ULP_ACT_HID_2d7c] = 356,
-	[BNXT_ULP_ACT_HID_0b7c] = 357,
-	[BNXT_ULP_ACT_HID_719c] = 358,
-	[BNXT_ULP_ACT_HID_28f0] = 359,
-	[BNXT_ULP_ACT_HID_3a00] = 360,
-	[BNXT_ULP_ACT_HID_026c] = 361,
-	[BNXT_ULP_ACT_HID_357c] = 362,
-	[BNXT_ULP_ACT_HID_137c] = 363,
-	[BNXT_ULP_ACT_HID_799c] = 364,
-	[BNXT_ULP_ACT_HID_30f0] = 365,
-	[BNXT_ULP_ACT_HID_4200] = 366,
-	[BNXT_ULP_ACT_HID_0a6c] = 367,
-	[BNXT_ULP_ACT_HID_3d7c] = 368,
-	[BNXT_ULP_ACT_HID_1b7c] = 369,
-	[BNXT_ULP_ACT_HID_05e0] = 370,
-	[BNXT_ULP_ACT_HID_38f0] = 371,
-	[BNXT_ULP_ACT_HID_4a00] = 372,
-	[BNXT_ULP_ACT_HID_0be4] = 373,
-	[BNXT_ULP_ACT_HID_3ef4] = 374,
-	[BNXT_ULP_ACT_HID_1cf4] = 375,
-	[BNXT_ULP_ACT_HID_0758] = 376,
-	[BNXT_ULP_ACT_HID_3a68] = 377,
-	[BNXT_ULP_ACT_HID_4b78] = 378,
-	[BNXT_ULP_ACT_HID_0bf4] = 379,
-	[BNXT_ULP_ACT_HID_3f04] = 380,
-	[BNXT_ULP_ACT_HID_1d04] = 381,
-	[BNXT_ULP_ACT_HID_0768] = 382,
-	[BNXT_ULP_ACT_HID_3a78] = 383,
-	[BNXT_ULP_ACT_HID_4b88] = 384,
-	[BNXT_ULP_ACT_HID_46f4] = 385,
-	[BNXT_ULP_ACT_HID_24f4] = 386,
-	[BNXT_ULP_ACT_HID_0f58] = 387,
-	[BNXT_ULP_ACT_HID_13e4] = 388,
-	[BNXT_ULP_ACT_HID_4268] = 389,
-	[BNXT_ULP_ACT_HID_5378] = 390,
-	[BNXT_ULP_ACT_HID_13f4] = 391,
-	[BNXT_ULP_ACT_HID_4704] = 392,
-	[BNXT_ULP_ACT_HID_2504] = 393,
-	[BNXT_ULP_ACT_HID_0f68] = 394,
-	[BNXT_ULP_ACT_HID_4278] = 395,
-	[BNXT_ULP_ACT_HID_5388] = 396,
-	[BNXT_ULP_ACT_HID_1be4] = 397,
-	[BNXT_ULP_ACT_HID_4ef4] = 398,
-	[BNXT_ULP_ACT_HID_2cf4] = 399,
-	[BNXT_ULP_ACT_HID_1758] = 400,
-	[BNXT_ULP_ACT_HID_4a68] = 401,
-	[BNXT_ULP_ACT_HID_5b78] = 402,
-	[BNXT_ULP_ACT_HID_1bf4] = 403,
-	[BNXT_ULP_ACT_HID_4f04] = 404,
-	[BNXT_ULP_ACT_HID_2d04] = 405,
-	[BNXT_ULP_ACT_HID_1768] = 406,
-	[BNXT_ULP_ACT_HID_4a78] = 407,
-	[BNXT_ULP_ACT_HID_5b88] = 408,
-	[BNXT_ULP_ACT_HID_23e4] = 409,
-	[BNXT_ULP_ACT_HID_56f4] = 410,
-	[BNXT_ULP_ACT_HID_34f4] = 411,
-	[BNXT_ULP_ACT_HID_1f58] = 412,
-	[BNXT_ULP_ACT_HID_5268] = 413,
-	[BNXT_ULP_ACT_HID_6378] = 414,
-	[BNXT_ULP_ACT_HID_23f4] = 415,
-	[BNXT_ULP_ACT_HID_5704] = 416,
-	[BNXT_ULP_ACT_HID_3504] = 417,
-	[BNXT_ULP_ACT_HID_1f68] = 418,
-	[BNXT_ULP_ACT_HID_5278] = 419,
-	[BNXT_ULP_ACT_HID_6388] = 420,
-	[BNXT_ULP_ACT_HID_1c36] = 421,
-	[BNXT_ULP_ACT_HID_2436] = 422,
-	[BNXT_ULP_ACT_HID_2c36] = 423,
-	[BNXT_ULP_ACT_HID_1c46] = 424,
-	[BNXT_ULP_ACT_HID_2446] = 425,
-	[BNXT_ULP_ACT_HID_2c46] = 426,
-	[BNXT_ULP_ACT_HID_2546] = 427,
-	[BNXT_ULP_ACT_HID_5856] = 428,
-	[BNXT_ULP_ACT_HID_3656] = 429,
-	[BNXT_ULP_ACT_HID_20ba] = 430,
-	[BNXT_ULP_ACT_HID_53ca] = 431,
-	[BNXT_ULP_ACT_HID_64da] = 432,
-	[BNXT_ULP_ACT_HID_2d46] = 433,
-	[BNXT_ULP_ACT_HID_6056] = 434,
-	[BNXT_ULP_ACT_HID_3e56] = 435,
-	[BNXT_ULP_ACT_HID_28ba] = 436,
-	[BNXT_ULP_ACT_HID_5bca] = 437,
-	[BNXT_ULP_ACT_HID_6cda] = 438,
-	[BNXT_ULP_ACT_HID_3546] = 439,
-	[BNXT_ULP_ACT_HID_6856] = 440,
-	[BNXT_ULP_ACT_HID_4656] = 441,
-	[BNXT_ULP_ACT_HID_30ba] = 442,
-	[BNXT_ULP_ACT_HID_63ca] = 443,
-	[BNXT_ULP_ACT_HID_74da] = 444,
-	[BNXT_ULP_ACT_HID_3d46] = 445,
-	[BNXT_ULP_ACT_HID_7056] = 446,
-	[BNXT_ULP_ACT_HID_4e56] = 447,
-	[BNXT_ULP_ACT_HID_38ba] = 448,
-	[BNXT_ULP_ACT_HID_6bca] = 449,
-	[BNXT_ULP_ACT_HID_011e] = 450,
-	[BNXT_ULP_ACT_HID_2556] = 451,
-	[BNXT_ULP_ACT_HID_5866] = 452,
-	[BNXT_ULP_ACT_HID_3666] = 453,
-	[BNXT_ULP_ACT_HID_20ca] = 454,
-	[BNXT_ULP_ACT_HID_53da] = 455,
-	[BNXT_ULP_ACT_HID_64ea] = 456,
-	[BNXT_ULP_ACT_HID_2d56] = 457,
-	[BNXT_ULP_ACT_HID_6066] = 458,
-	[BNXT_ULP_ACT_HID_3e66] = 459,
-	[BNXT_ULP_ACT_HID_28ca] = 460,
-	[BNXT_ULP_ACT_HID_5bda] = 461,
-	[BNXT_ULP_ACT_HID_6cea] = 462,
-	[BNXT_ULP_ACT_HID_3556] = 463,
-	[BNXT_ULP_ACT_HID_6866] = 464,
-	[BNXT_ULP_ACT_HID_4666] = 465,
-	[BNXT_ULP_ACT_HID_30ca] = 466,
-	[BNXT_ULP_ACT_HID_63da] = 467,
-	[BNXT_ULP_ACT_HID_74ea] = 468,
-	[BNXT_ULP_ACT_HID_3d56] = 469,
-	[BNXT_ULP_ACT_HID_7066] = 470,
-	[BNXT_ULP_ACT_HID_4e66] = 471,
-	[BNXT_ULP_ACT_HID_38ca] = 472,
-	[BNXT_ULP_ACT_HID_6bda] = 473,
-	[BNXT_ULP_ACT_HID_012e] = 474,
-	[BNXT_ULP_ACT_HID_3ece] = 475,
-	[BNXT_ULP_ACT_HID_71de] = 476,
-	[BNXT_ULP_ACT_HID_4fde] = 477,
-	[BNXT_ULP_ACT_HID_3a42] = 478,
-	[BNXT_ULP_ACT_HID_6d52] = 479,
-	[BNXT_ULP_ACT_HID_02a6] = 480,
-	[BNXT_ULP_ACT_HID_3ede] = 481,
-	[BNXT_ULP_ACT_HID_71ee] = 482,
-	[BNXT_ULP_ACT_HID_4fee] = 483,
-	[BNXT_ULP_ACT_HID_3a52] = 484,
-	[BNXT_ULP_ACT_HID_6d62] = 485,
-	[BNXT_ULP_ACT_HID_02b6] = 486,
-	[BNXT_ULP_ACT_HID_79de] = 487,
-	[BNXT_ULP_ACT_HID_57de] = 488,
-	[BNXT_ULP_ACT_HID_4242] = 489,
-	[BNXT_ULP_ACT_HID_46ce] = 490,
-	[BNXT_ULP_ACT_HID_7552] = 491,
-	[BNXT_ULP_ACT_HID_0aa6] = 492,
-	[BNXT_ULP_ACT_HID_46de] = 493,
-	[BNXT_ULP_ACT_HID_79ee] = 494,
-	[BNXT_ULP_ACT_HID_57ee] = 495,
-	[BNXT_ULP_ACT_HID_4252] = 496,
-	[BNXT_ULP_ACT_HID_7562] = 497,
-	[BNXT_ULP_ACT_HID_0ab6] = 498,
-	[BNXT_ULP_ACT_HID_4ece] = 499,
-	[BNXT_ULP_ACT_HID_0622] = 500,
-	[BNXT_ULP_ACT_HID_5fde] = 501,
-	[BNXT_ULP_ACT_HID_4a42] = 502,
-	[BNXT_ULP_ACT_HID_0196] = 503,
-	[BNXT_ULP_ACT_HID_12a6] = 504,
-	[BNXT_ULP_ACT_HID_4ede] = 505,
-	[BNXT_ULP_ACT_HID_0632] = 506,
-	[BNXT_ULP_ACT_HID_5fee] = 507,
-	[BNXT_ULP_ACT_HID_4a52] = 508,
-	[BNXT_ULP_ACT_HID_01a6] = 509,
-	[BNXT_ULP_ACT_HID_12b6] = 510,
-	[BNXT_ULP_ACT_HID_56ce] = 511,
-	[BNXT_ULP_ACT_HID_0e22] = 512,
-	[BNXT_ULP_ACT_HID_67de] = 513,
-	[BNXT_ULP_ACT_HID_5242] = 514,
-	[BNXT_ULP_ACT_HID_0996] = 515,
-	[BNXT_ULP_ACT_HID_1aa6] = 516,
-	[BNXT_ULP_ACT_HID_56de] = 517,
-	[BNXT_ULP_ACT_HID_0e32] = 518,
-	[BNXT_ULP_ACT_HID_67ee] = 519,
-	[BNXT_ULP_ACT_HID_5252] = 520,
-	[BNXT_ULP_ACT_HID_09a6] = 521,
-	[BNXT_ULP_ACT_HID_1ab6] = 522,
-	[BNXT_ULP_ACT_HID_31d0] = 523,
-	[BNXT_ULP_ACT_HID_31e0] = 524,
-	[BNXT_ULP_ACT_HID_39d0] = 525,
-	[BNXT_ULP_ACT_HID_39e0] = 526,
-	[BNXT_ULP_ACT_HID_41d0] = 527,
-	[BNXT_ULP_ACT_HID_41e0] = 528,
-	[BNXT_ULP_ACT_HID_49d0] = 529,
-	[BNXT_ULP_ACT_HID_49e0] = 530,
-	[BNXT_ULP_ACT_HID_64ba] = 531,
-	[BNXT_ULP_ACT_HID_64ca] = 532,
-	[BNXT_ULP_ACT_HID_6cba] = 533,
-	[BNXT_ULP_ACT_HID_6cca] = 534,
-	[BNXT_ULP_ACT_HID_74ba] = 535,
-	[BNXT_ULP_ACT_HID_74ca] = 536,
-	[BNXT_ULP_ACT_HID_00fe] = 537,
-	[BNXT_ULP_ACT_HID_010e] = 538,
-	[BNXT_ULP_ACT_HID_331c] = 539,
-	[BNXT_ULP_ACT_HID_332c] = 540,
-	[BNXT_ULP_ACT_HID_6706] = 541,
-	[BNXT_ULP_ACT_HID_6716] = 542,
-	[BNXT_ULP_ACT_HID_1b6d] = 543,
-	[BNXT_ULP_ACT_HID_1b7d] = 544,
-	[BNXT_ULP_ACT_HID_641a] = 545
+	[BNXT_ULP_ACT_HID_0040] = 2,
+	[BNXT_ULP_ACT_HID_10000] = 3,
+	[BNXT_ULP_ACT_HID_cc40] = 4,
+	[BNXT_ULP_ACT_HID_0400] = 5,
+	[BNXT_ULP_ACT_HID_1cc40] = 6,
+	[BNXT_ULP_ACT_HID_d040] = 7,
+	[BNXT_ULP_ACT_HID_0080] = 8,
+	[BNXT_ULP_ACT_HID_0200] = 9,
+	[BNXT_ULP_ACT_HID_0280] = 10,
+	[BNXT_ULP_ACT_HID_00c0] = 11,
+	[BNXT_ULP_ACT_HID_10080] = 12,
+	[BNXT_ULP_ACT_HID_ccc0] = 13,
+	[BNXT_ULP_ACT_HID_0480] = 14,
+	[BNXT_ULP_ACT_HID_1ccc0] = 15,
+	[BNXT_ULP_ACT_HID_d0c0] = 16,
+	[BNXT_ULP_ACT_HID_19742] = 17,
+	[BNXT_ULP_ACT_HID_19782] = 18,
+	[BNXT_ULP_ACT_HID_29742] = 19,
+	[BNXT_ULP_ACT_HID_26382] = 20,
+	[BNXT_ULP_ACT_HID_19b42] = 21,
+	[BNXT_ULP_ACT_HID_36382] = 22,
+	[BNXT_ULP_ACT_HID_26782] = 23,
+	[BNXT_ULP_ACT_HID_197c2] = 24,
+	[BNXT_ULP_ACT_HID_19802] = 25,
+	[BNXT_ULP_ACT_HID_297c2] = 26,
+	[BNXT_ULP_ACT_HID_26402] = 27,
+	[BNXT_ULP_ACT_HID_19bc2] = 28,
+	[BNXT_ULP_ACT_HID_36402] = 29,
+	[BNXT_ULP_ACT_HID_26802] = 30,
+	[BNXT_ULP_ACT_HID_bca0] = 31,
+	[BNXT_ULP_ACT_HID_bce0] = 32,
+	[BNXT_ULP_ACT_HID_1bca0] = 33,
+	[BNXT_ULP_ACT_HID_168e0] = 34,
+	[BNXT_ULP_ACT_HID_a0a0] = 35,
+	[BNXT_ULP_ACT_HID_268e0] = 36,
+	[BNXT_ULP_ACT_HID_16ce0] = 37,
+	[BNXT_ULP_ACT_HID_bd20] = 38,
+	[BNXT_ULP_ACT_HID_bd60] = 39,
+	[BNXT_ULP_ACT_HID_1bd20] = 40,
+	[BNXT_ULP_ACT_HID_16960] = 41,
+	[BNXT_ULP_ACT_HID_a120] = 42,
+	[BNXT_ULP_ACT_HID_26960] = 43,
+	[BNXT_ULP_ACT_HID_16d60] = 44,
+	[BNXT_ULP_ACT_HID_4040] = 45,
+	[BNXT_ULP_ACT_HID_8040] = 46,
+	[BNXT_ULP_ACT_HID_c040] = 47,
+	[BNXT_ULP_ACT_HID_40c0] = 48,
+	[BNXT_ULP_ACT_HID_80c0] = 49,
+	[BNXT_ULP_ACT_HID_c0c0] = 50,
+	[BNXT_ULP_ACT_HID_4400] = 51,
+	[BNXT_ULP_ACT_HID_8400] = 52,
+	[BNXT_ULP_ACT_HID_c400] = 53,
+	[BNXT_ULP_ACT_HID_4480] = 54,
+	[BNXT_ULP_ACT_HID_8480] = 55,
+	[BNXT_ULP_ACT_HID_c480] = 56,
+	[BNXT_ULP_ACT_HID_1d782] = 57,
+	[BNXT_ULP_ACT_HID_21782] = 58,
+	[BNXT_ULP_ACT_HID_25782] = 59,
+	[BNXT_ULP_ACT_HID_1d802] = 60,
+	[BNXT_ULP_ACT_HID_21802] = 61,
+	[BNXT_ULP_ACT_HID_25802] = 62,
+	[BNXT_ULP_ACT_HID_1db42] = 63,
+	[BNXT_ULP_ACT_HID_21b42] = 64,
+	[BNXT_ULP_ACT_HID_25b42] = 65,
+	[BNXT_ULP_ACT_HID_1dbc2] = 66,
+	[BNXT_ULP_ACT_HID_21bc2] = 67,
+	[BNXT_ULP_ACT_HID_25bc2] = 68,
+	[BNXT_ULP_ACT_HID_fce0] = 69,
+	[BNXT_ULP_ACT_HID_13ce0] = 70,
+	[BNXT_ULP_ACT_HID_17ce0] = 71,
+	[BNXT_ULP_ACT_HID_fd60] = 72,
+	[BNXT_ULP_ACT_HID_13d60] = 73,
+	[BNXT_ULP_ACT_HID_17d60] = 74,
+	[BNXT_ULP_ACT_HID_e0a0] = 75,
+	[BNXT_ULP_ACT_HID_120a0] = 76,
+	[BNXT_ULP_ACT_HID_160a0] = 77,
+	[BNXT_ULP_ACT_HID_e120] = 78,
+	[BNXT_ULP_ACT_HID_12120] = 79,
+	[BNXT_ULP_ACT_HID_16120] = 80,
+	[BNXT_ULP_ACT_HID_32061] = 81,
+	[BNXT_ULP_ACT_HID_320e1] = 82,
+	[BNXT_ULP_ACT_HID_388a] = 83,
+	[BNXT_ULP_ACT_HID_4000] = 84,
+	[BNXT_ULP_ACT_HID_8000] = 85,
+	[BNXT_ULP_ACT_HID_c000] = 86,
+	[BNXT_ULP_ACT_HID_4080] = 87,
+	[BNXT_ULP_ACT_HID_8080] = 88,
+	[BNXT_ULP_ACT_HID_c080] = 89,
+	[BNXT_ULP_ACT_HID_8880] = 90,
+	[BNXT_ULP_ACT_HID_22100] = 91,
+	[BNXT_ULP_ACT_HID_11100] = 92,
+	[BNXT_ULP_ACT_HID_6420] = 93,
+	[BNXT_ULP_ACT_HID_1fca0] = 94,
+	[BNXT_ULP_ACT_HID_19980] = 95,
+	[BNXT_ULP_ACT_HID_28520] = 96,
+	[BNXT_ULP_ACT_HID_c880] = 97,
+	[BNXT_ULP_ACT_HID_26100] = 98,
+	[BNXT_ULP_ACT_HID_15100] = 99,
+	[BNXT_ULP_ACT_HID_a420] = 100,
+	[BNXT_ULP_ACT_HID_23ca0] = 101,
+	[BNXT_ULP_ACT_HID_1d980] = 102,
+	[BNXT_ULP_ACT_HID_2c520] = 103,
+	[BNXT_ULP_ACT_HID_10880] = 104,
+	[BNXT_ULP_ACT_HID_2a100] = 105,
+	[BNXT_ULP_ACT_HID_19100] = 106,
+	[BNXT_ULP_ACT_HID_e420] = 107,
+	[BNXT_ULP_ACT_HID_27ca0] = 108,
+	[BNXT_ULP_ACT_HID_21980] = 109,
+	[BNXT_ULP_ACT_HID_30520] = 110,
+	[BNXT_ULP_ACT_HID_14880] = 111,
+	[BNXT_ULP_ACT_HID_2e100] = 112,
+	[BNXT_ULP_ACT_HID_1d100] = 113,
+	[BNXT_ULP_ACT_HID_12420] = 114,
+	[BNXT_ULP_ACT_HID_2bca0] = 115,
+	[BNXT_ULP_ACT_HID_25980] = 116,
+	[BNXT_ULP_ACT_HID_34520] = 117,
+	[BNXT_ULP_ACT_HID_8900] = 118,
+	[BNXT_ULP_ACT_HID_22180] = 119,
+	[BNXT_ULP_ACT_HID_11180] = 120,
+	[BNXT_ULP_ACT_HID_64a0] = 121,
+	[BNXT_ULP_ACT_HID_1fd20] = 122,
+	[BNXT_ULP_ACT_HID_19a00] = 123,
+	[BNXT_ULP_ACT_HID_285a0] = 124,
+	[BNXT_ULP_ACT_HID_c900] = 125,
+	[BNXT_ULP_ACT_HID_26180] = 126,
+	[BNXT_ULP_ACT_HID_15180] = 127,
+	[BNXT_ULP_ACT_HID_a4a0] = 128,
+	[BNXT_ULP_ACT_HID_23d20] = 129,
+	[BNXT_ULP_ACT_HID_1da00] = 130,
+	[BNXT_ULP_ACT_HID_2c5a0] = 131,
+	[BNXT_ULP_ACT_HID_10900] = 132,
+	[BNXT_ULP_ACT_HID_2a180] = 133,
+	[BNXT_ULP_ACT_HID_19180] = 134,
+	[BNXT_ULP_ACT_HID_e4a0] = 135,
+	[BNXT_ULP_ACT_HID_27d20] = 136,
+	[BNXT_ULP_ACT_HID_21a00] = 137,
+	[BNXT_ULP_ACT_HID_305a0] = 138,
+	[BNXT_ULP_ACT_HID_14900] = 139,
+	[BNXT_ULP_ACT_HID_2e180] = 140,
+	[BNXT_ULP_ACT_HID_1d180] = 141,
+	[BNXT_ULP_ACT_HID_124a0] = 142,
+	[BNXT_ULP_ACT_HID_2bd20] = 143,
+	[BNXT_ULP_ACT_HID_25a00] = 144,
+	[BNXT_ULP_ACT_HID_345a0] = 145,
+	[BNXT_ULP_ACT_HID_154c0] = 146,
+	[BNXT_ULP_ACT_HID_2ed40] = 147,
+	[BNXT_ULP_ACT_HID_1dd40] = 148,
+	[BNXT_ULP_ACT_HID_13060] = 149,
+	[BNXT_ULP_ACT_HID_2c8e0] = 150,
+	[BNXT_ULP_ACT_HID_35160] = 151,
+	[BNXT_ULP_ACT_HID_15540] = 152,
+	[BNXT_ULP_ACT_HID_2edc0] = 153,
+	[BNXT_ULP_ACT_HID_1ddc0] = 154,
+	[BNXT_ULP_ACT_HID_130e0] = 155,
+	[BNXT_ULP_ACT_HID_2c960] = 156,
+	[BNXT_ULP_ACT_HID_351e0] = 157,
+	[BNXT_ULP_ACT_HID_194c0] = 158,
+	[BNXT_ULP_ACT_HID_32d40] = 159,
+	[BNXT_ULP_ACT_HID_21d40] = 160,
+	[BNXT_ULP_ACT_HID_17060] = 161,
+	[BNXT_ULP_ACT_HID_308e0] = 162,
+	[BNXT_ULP_ACT_HID_39160] = 163,
+	[BNXT_ULP_ACT_HID_19540] = 164,
+	[BNXT_ULP_ACT_HID_32dc0] = 165,
+	[BNXT_ULP_ACT_HID_21dc0] = 166,
+	[BNXT_ULP_ACT_HID_170e0] = 167,
+	[BNXT_ULP_ACT_HID_30960] = 168,
+	[BNXT_ULP_ACT_HID_391e0] = 169,
+	[BNXT_ULP_ACT_HID_1d4c0] = 170,
+	[BNXT_ULP_ACT_HID_36d40] = 171,
+	[BNXT_ULP_ACT_HID_25d40] = 172,
+	[BNXT_ULP_ACT_HID_1b060] = 173,
+	[BNXT_ULP_ACT_HID_348e0] = 174,
+	[BNXT_ULP_ACT_HID_3d160] = 175,
+	[BNXT_ULP_ACT_HID_1d540] = 176,
+	[BNXT_ULP_ACT_HID_36dc0] = 177,
+	[BNXT_ULP_ACT_HID_25dc0] = 178,
+	[BNXT_ULP_ACT_HID_1b0e0] = 179,
+	[BNXT_ULP_ACT_HID_34960] = 180,
+	[BNXT_ULP_ACT_HID_3d1e0] = 181,
+	[BNXT_ULP_ACT_HID_214c0] = 182,
+	[BNXT_ULP_ACT_HID_3ad40] = 183,
+	[BNXT_ULP_ACT_HID_29d40] = 184,
+	[BNXT_ULP_ACT_HID_1f060] = 185,
+	[BNXT_ULP_ACT_HID_388e0] = 186,
+	[BNXT_ULP_ACT_HID_3380] = 187,
+	[BNXT_ULP_ACT_HID_21540] = 188,
+	[BNXT_ULP_ACT_HID_3adc0] = 189,
+	[BNXT_ULP_ACT_HID_29dc0] = 190,
+	[BNXT_ULP_ACT_HID_1f0e0] = 191,
+	[BNXT_ULP_ACT_HID_38960] = 192,
+	[BNXT_ULP_ACT_HID_3400] = 193,
+	[BNXT_ULP_ACT_HID_1d742] = 194,
+	[BNXT_ULP_ACT_HID_21742] = 195,
+	[BNXT_ULP_ACT_HID_25742] = 196,
+	[BNXT_ULP_ACT_HID_1d7c2] = 197,
+	[BNXT_ULP_ACT_HID_217c2] = 198,
+	[BNXT_ULP_ACT_HID_257c2] = 199,
+	[BNXT_ULP_ACT_HID_21fc2] = 200,
+	[BNXT_ULP_ACT_HID_3b842] = 201,
+	[BNXT_ULP_ACT_HID_2a842] = 202,
+	[BNXT_ULP_ACT_HID_1fb62] = 203,
+	[BNXT_ULP_ACT_HID_393e2] = 204,
+	[BNXT_ULP_ACT_HID_330c2] = 205,
+	[BNXT_ULP_ACT_HID_3e82] = 206,
+	[BNXT_ULP_ACT_HID_25fc2] = 207,
+	[BNXT_ULP_ACT_HID_1a62] = 208,
+	[BNXT_ULP_ACT_HID_2e842] = 209,
+	[BNXT_ULP_ACT_HID_23b62] = 210,
+	[BNXT_ULP_ACT_HID_3d3e2] = 211,
+	[BNXT_ULP_ACT_HID_370c2] = 212,
+	[BNXT_ULP_ACT_HID_7e82] = 213,
+	[BNXT_ULP_ACT_HID_29fc2] = 214,
+	[BNXT_ULP_ACT_HID_5a62] = 215,
+	[BNXT_ULP_ACT_HID_32842] = 216,
+	[BNXT_ULP_ACT_HID_27b62] = 217,
+	[BNXT_ULP_ACT_HID_3602] = 218,
+	[BNXT_ULP_ACT_HID_3b0c2] = 219,
+	[BNXT_ULP_ACT_HID_be82] = 220,
+	[BNXT_ULP_ACT_HID_2dfc2] = 221,
+	[BNXT_ULP_ACT_HID_9a62] = 222,
+	[BNXT_ULP_ACT_HID_36842] = 223,
+	[BNXT_ULP_ACT_HID_2bb62] = 224,
+	[BNXT_ULP_ACT_HID_7602] = 225,
+	[BNXT_ULP_ACT_HID_12e2] = 226,
+	[BNXT_ULP_ACT_HID_fe82] = 227,
+	[BNXT_ULP_ACT_HID_22042] = 228,
+	[BNXT_ULP_ACT_HID_3b8c2] = 229,
+	[BNXT_ULP_ACT_HID_2a8c2] = 230,
+	[BNXT_ULP_ACT_HID_1fbe2] = 231,
+	[BNXT_ULP_ACT_HID_39462] = 232,
+	[BNXT_ULP_ACT_HID_33142] = 233,
+	[BNXT_ULP_ACT_HID_3f02] = 234,
+	[BNXT_ULP_ACT_HID_26042] = 235,
+	[BNXT_ULP_ACT_HID_1ae2] = 236,
+	[BNXT_ULP_ACT_HID_2e8c2] = 237,
+	[BNXT_ULP_ACT_HID_23be2] = 238,
+	[BNXT_ULP_ACT_HID_3d462] = 239,
+	[BNXT_ULP_ACT_HID_37142] = 240,
+	[BNXT_ULP_ACT_HID_7f02] = 241,
+	[BNXT_ULP_ACT_HID_2a042] = 242,
+	[BNXT_ULP_ACT_HID_5ae2] = 243,
+	[BNXT_ULP_ACT_HID_328c2] = 244,
+	[BNXT_ULP_ACT_HID_27be2] = 245,
+	[BNXT_ULP_ACT_HID_3682] = 246,
+	[BNXT_ULP_ACT_HID_3b142] = 247,
+	[BNXT_ULP_ACT_HID_bf02] = 248,
+	[BNXT_ULP_ACT_HID_2e042] = 249,
+	[BNXT_ULP_ACT_HID_9ae2] = 250,
+	[BNXT_ULP_ACT_HID_368c2] = 251,
+	[BNXT_ULP_ACT_HID_2bbe2] = 252,
+	[BNXT_ULP_ACT_HID_7682] = 253,
+	[BNXT_ULP_ACT_HID_1362] = 254,
+	[BNXT_ULP_ACT_HID_ff02] = 255,
+	[BNXT_ULP_ACT_HID_2ec02] = 256,
+	[BNXT_ULP_ACT_HID_a6a2] = 257,
+	[BNXT_ULP_ACT_HID_37482] = 258,
+	[BNXT_ULP_ACT_HID_2c7a2] = 259,
+	[BNXT_ULP_ACT_HID_8242] = 260,
+	[BNXT_ULP_ACT_HID_10ac2] = 261,
+	[BNXT_ULP_ACT_HID_2ec82] = 262,
+	[BNXT_ULP_ACT_HID_a722] = 263,
+	[BNXT_ULP_ACT_HID_37502] = 264,
+	[BNXT_ULP_ACT_HID_2c822] = 265,
+	[BNXT_ULP_ACT_HID_82c2] = 266,
+	[BNXT_ULP_ACT_HID_10b42] = 267,
+	[BNXT_ULP_ACT_HID_32c02] = 268,
+	[BNXT_ULP_ACT_HID_e6a2] = 269,
+	[BNXT_ULP_ACT_HID_3b482] = 270,
+	[BNXT_ULP_ACT_HID_307a2] = 271,
+	[BNXT_ULP_ACT_HID_c242] = 272,
+	[BNXT_ULP_ACT_HID_14ac2] = 273,
+	[BNXT_ULP_ACT_HID_32c82] = 274,
+	[BNXT_ULP_ACT_HID_e722] = 275,
+	[BNXT_ULP_ACT_HID_3b502] = 276,
+	[BNXT_ULP_ACT_HID_30822] = 277,
+	[BNXT_ULP_ACT_HID_c2c2] = 278,
+	[BNXT_ULP_ACT_HID_14b42] = 279,
+	[BNXT_ULP_ACT_HID_36c02] = 280,
+	[BNXT_ULP_ACT_HID_126a2] = 281,
+	[BNXT_ULP_ACT_HID_16a2] = 282,
+	[BNXT_ULP_ACT_HID_347a2] = 283,
+	[BNXT_ULP_ACT_HID_10242] = 284,
+	[BNXT_ULP_ACT_HID_18ac2] = 285,
+	[BNXT_ULP_ACT_HID_36c82] = 286,
+	[BNXT_ULP_ACT_HID_12722] = 287,
+	[BNXT_ULP_ACT_HID_1722] = 288,
+	[BNXT_ULP_ACT_HID_34822] = 289,
+	[BNXT_ULP_ACT_HID_102c2] = 290,
+	[BNXT_ULP_ACT_HID_18b42] = 291,
+	[BNXT_ULP_ACT_HID_3ac02] = 292,
+	[BNXT_ULP_ACT_HID_166a2] = 293,
+	[BNXT_ULP_ACT_HID_56a2] = 294,
+	[BNXT_ULP_ACT_HID_387a2] = 295,
+	[BNXT_ULP_ACT_HID_14242] = 296,
+	[BNXT_ULP_ACT_HID_1cac2] = 297,
+	[BNXT_ULP_ACT_HID_3ac82] = 298,
+	[BNXT_ULP_ACT_HID_16722] = 299,
+	[BNXT_ULP_ACT_HID_5722] = 300,
+	[BNXT_ULP_ACT_HID_38822] = 301,
+	[BNXT_ULP_ACT_HID_142c2] = 302,
+	[BNXT_ULP_ACT_HID_1cb42] = 303,
+	[BNXT_ULP_ACT_HID_12520] = 304,
+	[BNXT_ULP_ACT_HID_2bda0] = 305,
+	[BNXT_ULP_ACT_HID_1ada0] = 306,
+	[BNXT_ULP_ACT_HID_120c0] = 307,
+	[BNXT_ULP_ACT_HID_2b940] = 308,
+	[BNXT_ULP_ACT_HID_23620] = 309,
+	[BNXT_ULP_ACT_HID_321c0] = 310,
+	[BNXT_ULP_ACT_HID_125a0] = 311,
+	[BNXT_ULP_ACT_HID_2be20] = 312,
+	[BNXT_ULP_ACT_HID_1ae20] = 313,
+	[BNXT_ULP_ACT_HID_12140] = 314,
+	[BNXT_ULP_ACT_HID_2b9c0] = 315,
+	[BNXT_ULP_ACT_HID_236a0] = 316,
+	[BNXT_ULP_ACT_HID_32240] = 317,
+	[BNXT_ULP_ACT_HID_1f160] = 318,
+	[BNXT_ULP_ACT_HID_3a9e0] = 319,
+	[BNXT_ULP_ACT_HID_279e0] = 320,
+	[BNXT_ULP_ACT_HID_1ed00] = 321,
+	[BNXT_ULP_ACT_HID_36580] = 322,
+	[BNXT_ULP_ACT_HID_3020] = 323,
+	[BNXT_ULP_ACT_HID_1f1e0] = 324,
+	[BNXT_ULP_ACT_HID_3aa60] = 325,
+	[BNXT_ULP_ACT_HID_27a60] = 326,
+	[BNXT_ULP_ACT_HID_1ed80] = 327,
+	[BNXT_ULP_ACT_HID_36600] = 328,
+	[BNXT_ULP_ACT_HID_30a0] = 329,
+	[BNXT_ULP_ACT_HID_0100] = 330,
+	[BNXT_ULP_ACT_HID_0180] = 331,
+	[BNXT_ULP_ACT_HID_32e84] = 332,
+	[BNXT_ULP_ACT_HID_32f04] = 333,
+	[BNXT_ULP_ACT_HID_19842] = 334,
+	[BNXT_ULP_ACT_HID_198c2] = 335,
+	[BNXT_ULP_ACT_HID_e7e6] = 336,
+	[BNXT_ULP_ACT_HID_e866] = 337,
+	[BNXT_ULP_ACT_HID_a3e0] = 338,
+	[BNXT_ULP_ACT_HID_240e0] = 339,
+	[BNXT_ULP_ACT_HID_322c8] = 340,
+	[BNXT_ULP_ACT_HID_e228] = 341,
+	[BNXT_ULP_ACT_HID_36130] = 342,
+	[BNXT_ULP_ACT_HID_2e840] = 343,
+	[BNXT_ULP_ACT_HID_2e880] = 344,
+	[BNXT_ULP_ACT_HID_2e900] = 345,
+	[BNXT_ULP_ACT_HID_170c0] = 346,
+	[BNXT_ULP_ACT_HID_14ea0] = 347,
+	[BNXT_ULP_ACT_HID_3b480] = 348,
+	[BNXT_ULP_ACT_HID_23d00] = 349,
+	[BNXT_ULP_ACT_HID_21ae0] = 350,
+	[BNXT_ULP_ACT_HID_2e8c0] = 351,
+	[BNXT_ULP_ACT_HID_17140] = 352,
+	[BNXT_ULP_ACT_HID_14f20] = 353,
+	[BNXT_ULP_ACT_HID_3b500] = 354,
+	[BNXT_ULP_ACT_HID_23d80] = 355,
+	[BNXT_ULP_ACT_HID_21b60] = 356,
+	[BNXT_ULP_ACT_HID_a1a2] = 357,
+	[BNXT_ULP_ACT_HID_a1e2] = 358,
+	[BNXT_ULP_ACT_HID_a262] = 359,
+	[BNXT_ULP_ACT_HID_30802] = 360,
+	[BNXT_ULP_ACT_HID_2e5e2] = 361,
+	[BNXT_ULP_ACT_HID_16de2] = 362,
+	[BNXT_ULP_ACT_HID_3d442] = 363,
+	[BNXT_ULP_ACT_HID_3b222] = 364,
+	[BNXT_ULP_ACT_HID_a222] = 365,
+	[BNXT_ULP_ACT_HID_30882] = 366,
+	[BNXT_ULP_ACT_HID_2e662] = 367,
+	[BNXT_ULP_ACT_HID_16e62] = 368,
+	[BNXT_ULP_ACT_HID_3d4c2] = 369,
+	[BNXT_ULP_ACT_HID_3b2a2] = 370,
+	[BNXT_ULP_ACT_HID_3a4e0] = 371,
+	[BNXT_ULP_ACT_HID_3a520] = 372,
+	[BNXT_ULP_ACT_HID_3a5a0] = 373,
+	[BNXT_ULP_ACT_HID_22d60] = 374,
+	[BNXT_ULP_ACT_HID_1eb40] = 375,
+	[BNXT_ULP_ACT_HID_7340] = 376,
+	[BNXT_ULP_ACT_HID_2f9a0] = 377,
+	[BNXT_ULP_ACT_HID_2b780] = 378,
+	[BNXT_ULP_ACT_HID_3a560] = 379,
+	[BNXT_ULP_ACT_HID_22de0] = 380,
+	[BNXT_ULP_ACT_HID_1ebc0] = 381,
+	[BNXT_ULP_ACT_HID_73c0] = 382,
+	[BNXT_ULP_ACT_HID_2fa20] = 383,
+	[BNXT_ULP_ACT_HID_2b800] = 384,
+	[BNXT_ULP_ACT_HID_32840] = 385,
+	[BNXT_ULP_ACT_HID_36840] = 386,
+	[BNXT_ULP_ACT_HID_3a840] = 387,
+	[BNXT_ULP_ACT_HID_328c0] = 388,
+	[BNXT_ULP_ACT_HID_368c0] = 389,
+	[BNXT_ULP_ACT_HID_3a8c0] = 390,
+	[BNXT_ULP_ACT_HID_370c0] = 391,
+	[BNXT_ULP_ACT_HID_12b60] = 392,
+	[BNXT_ULP_ACT_HID_1b60] = 393,
+	[BNXT_ULP_ACT_HID_34c60] = 394,
+	[BNXT_ULP_ACT_HID_10700] = 395,
+	[BNXT_ULP_ACT_HID_18f80] = 396,
+	[BNXT_ULP_ACT_HID_3b0c0] = 397,
+	[BNXT_ULP_ACT_HID_16b60] = 398,
+	[BNXT_ULP_ACT_HID_5b60] = 399,
+	[BNXT_ULP_ACT_HID_38c60] = 400,
+	[BNXT_ULP_ACT_HID_14700] = 401,
+	[BNXT_ULP_ACT_HID_1cf80] = 402,
+	[BNXT_ULP_ACT_HID_12e0] = 403,
+	[BNXT_ULP_ACT_HID_1ab60] = 404,
+	[BNXT_ULP_ACT_HID_9b60] = 405,
+	[BNXT_ULP_ACT_HID_3cc60] = 406,
+	[BNXT_ULP_ACT_HID_18700] = 407,
+	[BNXT_ULP_ACT_HID_20f80] = 408,
+	[BNXT_ULP_ACT_HID_52e0] = 409,
+	[BNXT_ULP_ACT_HID_1eb60] = 410,
+	[BNXT_ULP_ACT_HID_db60] = 411,
+	[BNXT_ULP_ACT_HID_2e80] = 412,
+	[BNXT_ULP_ACT_HID_1c700] = 413,
+	[BNXT_ULP_ACT_HID_24f80] = 414,
+	[BNXT_ULP_ACT_HID_37140] = 415,
+	[BNXT_ULP_ACT_HID_12be0] = 416,
+	[BNXT_ULP_ACT_HID_1be0] = 417,
+	[BNXT_ULP_ACT_HID_34ce0] = 418,
+	[BNXT_ULP_ACT_HID_10780] = 419,
+	[BNXT_ULP_ACT_HID_19000] = 420,
+	[BNXT_ULP_ACT_HID_3b140] = 421,
+	[BNXT_ULP_ACT_HID_16be0] = 422,
+	[BNXT_ULP_ACT_HID_5be0] = 423,
+	[BNXT_ULP_ACT_HID_38ce0] = 424,
+	[BNXT_ULP_ACT_HID_14780] = 425,
+	[BNXT_ULP_ACT_HID_1d000] = 426,
+	[BNXT_ULP_ACT_HID_1360] = 427,
+	[BNXT_ULP_ACT_HID_1abe0] = 428,
+	[BNXT_ULP_ACT_HID_9be0] = 429,
+	[BNXT_ULP_ACT_HID_3cce0] = 430,
+	[BNXT_ULP_ACT_HID_18780] = 431,
+	[BNXT_ULP_ACT_HID_21000] = 432,
+	[BNXT_ULP_ACT_HID_5360] = 433,
+	[BNXT_ULP_ACT_HID_1ebe0] = 434,
+	[BNXT_ULP_ACT_HID_dbe0] = 435,
+	[BNXT_ULP_ACT_HID_2f00] = 436,
+	[BNXT_ULP_ACT_HID_1c780] = 437,
+	[BNXT_ULP_ACT_HID_25000] = 438,
+	[BNXT_ULP_ACT_HID_5f20] = 439,
+	[BNXT_ULP_ACT_HID_1f7a0] = 440,
+	[BNXT_ULP_ACT_HID_e7a0] = 441,
+	[BNXT_ULP_ACT_HID_3ac0] = 442,
+	[BNXT_ULP_ACT_HID_1d340] = 443,
+	[BNXT_ULP_ACT_HID_25bc0] = 444,
+	[BNXT_ULP_ACT_HID_5fa0] = 445,
+	[BNXT_ULP_ACT_HID_1f820] = 446,
+	[BNXT_ULP_ACT_HID_e820] = 447,
+	[BNXT_ULP_ACT_HID_3b40] = 448,
+	[BNXT_ULP_ACT_HID_1d3c0] = 449,
+	[BNXT_ULP_ACT_HID_25c40] = 450,
+	[BNXT_ULP_ACT_HID_237a0] = 451,
+	[BNXT_ULP_ACT_HID_127a0] = 452,
+	[BNXT_ULP_ACT_HID_7ac0] = 453,
+	[BNXT_ULP_ACT_HID_9f20] = 454,
+	[BNXT_ULP_ACT_HID_21340] = 455,
+	[BNXT_ULP_ACT_HID_29bc0] = 456,
+	[BNXT_ULP_ACT_HID_9fa0] = 457,
+	[BNXT_ULP_ACT_HID_23820] = 458,
+	[BNXT_ULP_ACT_HID_12820] = 459,
+	[BNXT_ULP_ACT_HID_7b40] = 460,
+	[BNXT_ULP_ACT_HID_213c0] = 461,
+	[BNXT_ULP_ACT_HID_29c40] = 462,
+	[BNXT_ULP_ACT_HID_df20] = 463,
+	[BNXT_ULP_ACT_HID_277a0] = 464,
+	[BNXT_ULP_ACT_HID_167a0] = 465,
+	[BNXT_ULP_ACT_HID_bac0] = 466,
+	[BNXT_ULP_ACT_HID_25340] = 467,
+	[BNXT_ULP_ACT_HID_2dbc0] = 468,
+	[BNXT_ULP_ACT_HID_dfa0] = 469,
+	[BNXT_ULP_ACT_HID_27820] = 470,
+	[BNXT_ULP_ACT_HID_16820] = 471,
+	[BNXT_ULP_ACT_HID_bb40] = 472,
+	[BNXT_ULP_ACT_HID_253c0] = 473,
+	[BNXT_ULP_ACT_HID_2dc40] = 474,
+	[BNXT_ULP_ACT_HID_11f20] = 475,
+	[BNXT_ULP_ACT_HID_2b7a0] = 476,
+	[BNXT_ULP_ACT_HID_1a7a0] = 477,
+	[BNXT_ULP_ACT_HID_fac0] = 478,
+	[BNXT_ULP_ACT_HID_29340] = 479,
+	[BNXT_ULP_ACT_HID_31bc0] = 480,
+	[BNXT_ULP_ACT_HID_11fa0] = 481,
+	[BNXT_ULP_ACT_HID_2b820] = 482,
+	[BNXT_ULP_ACT_HID_1a820] = 483,
+	[BNXT_ULP_ACT_HID_fb40] = 484,
+	[BNXT_ULP_ACT_HID_293c0] = 485,
+	[BNXT_ULP_ACT_HID_31c40] = 486,
+	[BNXT_ULP_ACT_HID_e1a2] = 487,
+	[BNXT_ULP_ACT_HID_121a2] = 488,
+	[BNXT_ULP_ACT_HID_161a2] = 489,
+	[BNXT_ULP_ACT_HID_e222] = 490,
+	[BNXT_ULP_ACT_HID_12222] = 491,
+	[BNXT_ULP_ACT_HID_16222] = 492,
+	[BNXT_ULP_ACT_HID_12a22] = 493,
+	[BNXT_ULP_ACT_HID_2c2a2] = 494,
+	[BNXT_ULP_ACT_HID_1b2a2] = 495,
+	[BNXT_ULP_ACT_HID_105c2] = 496,
+	[BNXT_ULP_ACT_HID_29e42] = 497,
+	[BNXT_ULP_ACT_HID_326c2] = 498,
+	[BNXT_ULP_ACT_HID_16a22] = 499,
+	[BNXT_ULP_ACT_HID_302a2] = 500,
+	[BNXT_ULP_ACT_HID_1f2a2] = 501,
+	[BNXT_ULP_ACT_HID_145c2] = 502,
+	[BNXT_ULP_ACT_HID_2de42] = 503,
+	[BNXT_ULP_ACT_HID_366c2] = 504,
+	[BNXT_ULP_ACT_HID_1aa22] = 505,
+	[BNXT_ULP_ACT_HID_342a2] = 506,
+	[BNXT_ULP_ACT_HID_232a2] = 507,
+	[BNXT_ULP_ACT_HID_185c2] = 508,
+	[BNXT_ULP_ACT_HID_31e42] = 509,
+	[BNXT_ULP_ACT_HID_3a6c2] = 510,
+	[BNXT_ULP_ACT_HID_1ea22] = 511,
+	[BNXT_ULP_ACT_HID_382a2] = 512,
+	[BNXT_ULP_ACT_HID_272a2] = 513,
+	[BNXT_ULP_ACT_HID_1c5c2] = 514,
+	[BNXT_ULP_ACT_HID_35e42] = 515,
+	[BNXT_ULP_ACT_HID_08e2] = 516,
+	[BNXT_ULP_ACT_HID_12aa2] = 517,
+	[BNXT_ULP_ACT_HID_2c322] = 518,
+	[BNXT_ULP_ACT_HID_1b322] = 519,
+	[BNXT_ULP_ACT_HID_10642] = 520,
+	[BNXT_ULP_ACT_HID_29ec2] = 521,
+	[BNXT_ULP_ACT_HID_32742] = 522,
+	[BNXT_ULP_ACT_HID_16aa2] = 523,
+	[BNXT_ULP_ACT_HID_30322] = 524,
+	[BNXT_ULP_ACT_HID_1f322] = 525,
+	[BNXT_ULP_ACT_HID_14642] = 526,
+	[BNXT_ULP_ACT_HID_2dec2] = 527,
+	[BNXT_ULP_ACT_HID_36742] = 528,
+	[BNXT_ULP_ACT_HID_1aaa2] = 529,
+	[BNXT_ULP_ACT_HID_34322] = 530,
+	[BNXT_ULP_ACT_HID_23322] = 531,
+	[BNXT_ULP_ACT_HID_18642] = 532,
+	[BNXT_ULP_ACT_HID_31ec2] = 533,
+	[BNXT_ULP_ACT_HID_3a742] = 534,
+	[BNXT_ULP_ACT_HID_1eaa2] = 535,
+	[BNXT_ULP_ACT_HID_38322] = 536,
+	[BNXT_ULP_ACT_HID_27322] = 537,
+	[BNXT_ULP_ACT_HID_1c642] = 538,
+	[BNXT_ULP_ACT_HID_35ec2] = 539,
+	[BNXT_ULP_ACT_HID_0962] = 540,
+	[BNXT_ULP_ACT_HID_1f662] = 541,
+	[BNXT_ULP_ACT_HID_38ee2] = 542,
+	[BNXT_ULP_ACT_HID_27ee2] = 543,
+	[BNXT_ULP_ACT_HID_1d202] = 544,
+	[BNXT_ULP_ACT_HID_36a82] = 545,
+	[BNXT_ULP_ACT_HID_1522] = 546,
+	[BNXT_ULP_ACT_HID_1f6e2] = 547,
+	[BNXT_ULP_ACT_HID_38f62] = 548,
+	[BNXT_ULP_ACT_HID_27f62] = 549,
+	[BNXT_ULP_ACT_HID_1d282] = 550,
+	[BNXT_ULP_ACT_HID_36b02] = 551,
+	[BNXT_ULP_ACT_HID_15a2] = 552,
+	[BNXT_ULP_ACT_HID_3cee2] = 553,
+	[BNXT_ULP_ACT_HID_2bee2] = 554,
+	[BNXT_ULP_ACT_HID_21202] = 555,
+	[BNXT_ULP_ACT_HID_23662] = 556,
+	[BNXT_ULP_ACT_HID_3aa82] = 557,
+	[BNXT_ULP_ACT_HID_5522] = 558,
+	[BNXT_ULP_ACT_HID_236e2] = 559,
+	[BNXT_ULP_ACT_HID_3cf62] = 560,
+	[BNXT_ULP_ACT_HID_2bf62] = 561,
+	[BNXT_ULP_ACT_HID_21282] = 562,
+	[BNXT_ULP_ACT_HID_3ab02] = 563,
+	[BNXT_ULP_ACT_HID_55a2] = 564,
+	[BNXT_ULP_ACT_HID_27662] = 565,
+	[BNXT_ULP_ACT_HID_3102] = 566,
+	[BNXT_ULP_ACT_HID_2fee2] = 567,
+	[BNXT_ULP_ACT_HID_25202] = 568,
+	[BNXT_ULP_ACT_HID_0ca2] = 569,
+	[BNXT_ULP_ACT_HID_9522] = 570,
+	[BNXT_ULP_ACT_HID_276e2] = 571,
+	[BNXT_ULP_ACT_HID_3182] = 572,
+	[BNXT_ULP_ACT_HID_2ff62] = 573,
+	[BNXT_ULP_ACT_HID_25282] = 574,
+	[BNXT_ULP_ACT_HID_0d22] = 575,
+	[BNXT_ULP_ACT_HID_95a2] = 576,
+	[BNXT_ULP_ACT_HID_2b662] = 577,
+	[BNXT_ULP_ACT_HID_7102] = 578,
+	[BNXT_ULP_ACT_HID_33ee2] = 579,
+	[BNXT_ULP_ACT_HID_29202] = 580,
+	[BNXT_ULP_ACT_HID_4ca2] = 581,
+	[BNXT_ULP_ACT_HID_d522] = 582,
+	[BNXT_ULP_ACT_HID_2b6e2] = 583,
+	[BNXT_ULP_ACT_HID_7182] = 584,
+	[BNXT_ULP_ACT_HID_33f62] = 585,
+	[BNXT_ULP_ACT_HID_29282] = 586,
+	[BNXT_ULP_ACT_HID_4d22] = 587,
+	[BNXT_ULP_ACT_HID_d5a2] = 588,
+	[BNXT_ULP_ACT_HID_3e4e0] = 589,
+	[BNXT_ULP_ACT_HID_2700] = 590,
+	[BNXT_ULP_ACT_HID_6700] = 591,
+	[BNXT_ULP_ACT_HID_3e560] = 592,
+	[BNXT_ULP_ACT_HID_2780] = 593,
+	[BNXT_ULP_ACT_HID_6780] = 594,
+	[BNXT_ULP_ACT_HID_2f80] = 595,
+	[BNXT_ULP_ACT_HID_1e800] = 596,
+	[BNXT_ULP_ACT_HID_b800] = 597,
+	[BNXT_ULP_ACT_HID_2b20] = 598,
+	[BNXT_ULP_ACT_HID_1a3a0] = 599,
+	[BNXT_ULP_ACT_HID_22c20] = 600,
+	[BNXT_ULP_ACT_HID_6f80] = 601,
+	[BNXT_ULP_ACT_HID_22800] = 602,
+	[BNXT_ULP_ACT_HID_f800] = 603,
+	[BNXT_ULP_ACT_HID_6b20] = 604,
+	[BNXT_ULP_ACT_HID_1e3a0] = 605,
+	[BNXT_ULP_ACT_HID_26c20] = 606,
+	[BNXT_ULP_ACT_HID_af80] = 607,
+	[BNXT_ULP_ACT_HID_26800] = 608,
+	[BNXT_ULP_ACT_HID_13800] = 609,
+	[BNXT_ULP_ACT_HID_ab20] = 610,
+	[BNXT_ULP_ACT_HID_223a0] = 611,
+	[BNXT_ULP_ACT_HID_2ac20] = 612,
+	[BNXT_ULP_ACT_HID_ef80] = 613,
+	[BNXT_ULP_ACT_HID_2a800] = 614,
+	[BNXT_ULP_ACT_HID_17800] = 615,
+	[BNXT_ULP_ACT_HID_eb20] = 616,
+	[BNXT_ULP_ACT_HID_263a0] = 617,
+	[BNXT_ULP_ACT_HID_2ec20] = 618,
+	[BNXT_ULP_ACT_HID_3000] = 619,
+	[BNXT_ULP_ACT_HID_1e880] = 620,
+	[BNXT_ULP_ACT_HID_b880] = 621,
+	[BNXT_ULP_ACT_HID_2ba0] = 622,
+	[BNXT_ULP_ACT_HID_1a420] = 623,
+	[BNXT_ULP_ACT_HID_22ca0] = 624,
+	[BNXT_ULP_ACT_HID_7000] = 625,
+	[BNXT_ULP_ACT_HID_22880] = 626,
+	[BNXT_ULP_ACT_HID_f880] = 627,
+	[BNXT_ULP_ACT_HID_6ba0] = 628,
+	[BNXT_ULP_ACT_HID_1e420] = 629,
+	[BNXT_ULP_ACT_HID_26ca0] = 630,
+	[BNXT_ULP_ACT_HID_b000] = 631,
+	[BNXT_ULP_ACT_HID_26880] = 632,
+	[BNXT_ULP_ACT_HID_13880] = 633,
+	[BNXT_ULP_ACT_HID_aba0] = 634,
+	[BNXT_ULP_ACT_HID_22420] = 635,
+	[BNXT_ULP_ACT_HID_2aca0] = 636,
+	[BNXT_ULP_ACT_HID_f000] = 637,
+	[BNXT_ULP_ACT_HID_2a880] = 638,
+	[BNXT_ULP_ACT_HID_17880] = 639,
+	[BNXT_ULP_ACT_HID_eba0] = 640,
+	[BNXT_ULP_ACT_HID_26420] = 641,
+	[BNXT_ULP_ACT_HID_2eca0] = 642,
+	[BNXT_ULP_ACT_HID_fbc0] = 643,
+	[BNXT_ULP_ACT_HID_2b440] = 644,
+	[BNXT_ULP_ACT_HID_1a440] = 645,
+	[BNXT_ULP_ACT_HID_f760] = 646,
+	[BNXT_ULP_ACT_HID_26fe0] = 647,
+	[BNXT_ULP_ACT_HID_2f860] = 648,
+	[BNXT_ULP_ACT_HID_fc40] = 649,
+	[BNXT_ULP_ACT_HID_2b4c0] = 650,
+	[BNXT_ULP_ACT_HID_1a4c0] = 651,
+	[BNXT_ULP_ACT_HID_f7e0] = 652,
+	[BNXT_ULP_ACT_HID_27060] = 653,
+	[BNXT_ULP_ACT_HID_2f8e0] = 654,
+	[BNXT_ULP_ACT_HID_2f440] = 655,
+	[BNXT_ULP_ACT_HID_1e440] = 656,
+	[BNXT_ULP_ACT_HID_13760] = 657,
+	[BNXT_ULP_ACT_HID_13bc0] = 658,
+	[BNXT_ULP_ACT_HID_2afe0] = 659,
+	[BNXT_ULP_ACT_HID_33860] = 660,
+	[BNXT_ULP_ACT_HID_13c40] = 661,
+	[BNXT_ULP_ACT_HID_2f4c0] = 662,
+	[BNXT_ULP_ACT_HID_1e4c0] = 663,
+	[BNXT_ULP_ACT_HID_137e0] = 664,
+	[BNXT_ULP_ACT_HID_2b060] = 665,
+	[BNXT_ULP_ACT_HID_338e0] = 666,
+	[BNXT_ULP_ACT_HID_17bc0] = 667,
+	[BNXT_ULP_ACT_HID_33440] = 668,
+	[BNXT_ULP_ACT_HID_22440] = 669,
+	[BNXT_ULP_ACT_HID_17760] = 670,
+	[BNXT_ULP_ACT_HID_2efe0] = 671,
+	[BNXT_ULP_ACT_HID_37860] = 672,
+	[BNXT_ULP_ACT_HID_17c40] = 673,
+	[BNXT_ULP_ACT_HID_334c0] = 674,
+	[BNXT_ULP_ACT_HID_224c0] = 675,
+	[BNXT_ULP_ACT_HID_177e0] = 676,
+	[BNXT_ULP_ACT_HID_2f060] = 677,
+	[BNXT_ULP_ACT_HID_378e0] = 678,
+	[BNXT_ULP_ACT_HID_1bbc0] = 679,
+	[BNXT_ULP_ACT_HID_37440] = 680,
+	[BNXT_ULP_ACT_HID_26440] = 681,
+	[BNXT_ULP_ACT_HID_1b760] = 682,
+	[BNXT_ULP_ACT_HID_32fe0] = 683,
+	[BNXT_ULP_ACT_HID_3b860] = 684,
+	[BNXT_ULP_ACT_HID_1bc40] = 685,
+	[BNXT_ULP_ACT_HID_374c0] = 686,
+	[BNXT_ULP_ACT_HID_264c0] = 687,
+	[BNXT_ULP_ACT_HID_1b7e0] = 688,
+	[BNXT_ULP_ACT_HID_33060] = 689,
+	[BNXT_ULP_ACT_HID_3b8e0] = 690,
+	[BNXT_ULP_ACT_HID_18e80] = 691,
+	[BNXT_ULP_ACT_HID_18f00] = 692,
+	[BNXT_ULP_ACT_HID_1ce80] = 693,
+	[BNXT_ULP_ACT_HID_1cf00] = 694,
+	[BNXT_ULP_ACT_HID_20e80] = 695,
+	[BNXT_ULP_ACT_HID_20f00] = 696,
+	[BNXT_ULP_ACT_HID_24e80] = 697,
+	[BNXT_ULP_ACT_HID_24f00] = 698,
+	[BNXT_ULP_ACT_HID_325c2] = 699,
+	[BNXT_ULP_ACT_HID_32642] = 700,
+	[BNXT_ULP_ACT_HID_365c2] = 701,
+	[BNXT_ULP_ACT_HID_36642] = 702,
+	[BNXT_ULP_ACT_HID_3a5c2] = 703,
+	[BNXT_ULP_ACT_HID_3a642] = 704,
+	[BNXT_ULP_ACT_HID_07e2] = 705,
+	[BNXT_ULP_ACT_HID_0862] = 706,
+	[BNXT_ULP_ACT_HID_22b20] = 707,
+	[BNXT_ULP_ACT_HID_22ba0] = 708,
+	[BNXT_ULP_ACT_HID_26b20] = 709,
+	[BNXT_ULP_ACT_HID_26ba0] = 710,
+	[BNXT_ULP_ACT_HID_2ab20] = 711,
+	[BNXT_ULP_ACT_HID_2aba0] = 712,
+	[BNXT_ULP_ACT_HID_2eb20] = 713,
+	[BNXT_ULP_ACT_HID_2eba0] = 714,
+	[BNXT_ULP_ACT_HID_199e0] = 715,
+	[BNXT_ULP_ACT_HID_19960] = 716,
+	[BNXT_ULP_ACT_HID_33122] = 717,
+	[BNXT_ULP_ACT_HID_331a2] = 718,
+	[BNXT_ULP_ACT_HID_23580] = 719,
+	[BNXT_ULP_ACT_HID_23700] = 720,
+	[BNXT_ULP_ACT_HID_db61] = 721,
+	[BNXT_ULP_ACT_HID_dbe1] = 722,
+	[BNXT_ULP_ACT_HID_320ca] = 723
 };
 
 /* Array for the act matcher list */
@@ -571,7 +749,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 1
 	},
 	[2] = {
-	.act_hid = BNXT_ULP_ACT_HID_0008,
+	.act_hid = BNXT_ULP_ACT_HID_0040,
 	.act_pattern_id = 1,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -580,7 +758,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 1
 	},
 	[3] = {
-	.act_hid = BNXT_ULP_ACT_HID_2000,
+	.act_hid = BNXT_ULP_ACT_HID_10000,
 	.act_pattern_id = 2,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -589,7 +767,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 1
 	},
 	[4] = {
-	.act_hid = BNXT_ULP_ACT_HID_1988,
+	.act_hid = BNXT_ULP_ACT_HID_cc40,
 	.act_pattern_id = 3,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -598,7 +776,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 1
 	},
 	[5] = {
-	.act_hid = BNXT_ULP_ACT_HID_0080,
+	.act_hid = BNXT_ULP_ACT_HID_0400,
 	.act_pattern_id = 4,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -607,7 +785,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 1
 	},
 	[6] = {
-	.act_hid = BNXT_ULP_ACT_HID_3988,
+	.act_hid = BNXT_ULP_ACT_HID_1cc40,
 	.act_pattern_id = 5,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -617,7 +795,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 1
 	},
 	[7] = {
-	.act_hid = BNXT_ULP_ACT_HID_1a08,
+	.act_hid = BNXT_ULP_ACT_HID_d040,
 	.act_pattern_id = 6,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -627,7 +805,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 1
 	},
 	[8] = {
-	.act_hid = BNXT_ULP_ACT_HID_0010,
+	.act_hid = BNXT_ULP_ACT_HID_0080,
 	.act_pattern_id = 7,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -636,7 +814,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 1
 	},
 	[9] = {
-	.act_hid = BNXT_ULP_ACT_HID_0040,
+	.act_hid = BNXT_ULP_ACT_HID_0200,
 	.act_pattern_id = 8,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -645,7 +823,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 1
 	},
 	[10] = {
-	.act_hid = BNXT_ULP_ACT_HID_0050,
+	.act_hid = BNXT_ULP_ACT_HID_0280,
 	.act_pattern_id = 9,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -655,7 +833,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 1
 	},
 	[11] = {
-	.act_hid = BNXT_ULP_ACT_HID_0018,
+	.act_hid = BNXT_ULP_ACT_HID_00c0,
 	.act_pattern_id = 10,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -665,7 +843,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 1
 	},
 	[12] = {
-	.act_hid = BNXT_ULP_ACT_HID_2010,
+	.act_hid = BNXT_ULP_ACT_HID_10080,
 	.act_pattern_id = 11,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -675,7 +853,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 1
 	},
 	[13] = {
-	.act_hid = BNXT_ULP_ACT_HID_1998,
+	.act_hid = BNXT_ULP_ACT_HID_ccc0,
 	.act_pattern_id = 12,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -685,7 +863,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 1
 	},
 	[14] = {
-	.act_hid = BNXT_ULP_ACT_HID_0090,
+	.act_hid = BNXT_ULP_ACT_HID_0480,
 	.act_pattern_id = 13,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -695,7 +873,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 1
 	},
 	[15] = {
-	.act_hid = BNXT_ULP_ACT_HID_3998,
+	.act_hid = BNXT_ULP_ACT_HID_1ccc0,
 	.act_pattern_id = 14,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -706,7 +884,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 1
 	},
 	[16] = {
-	.act_hid = BNXT_ULP_ACT_HID_1a18,
+	.act_hid = BNXT_ULP_ACT_HID_d0c0,
 	.act_pattern_id = 15,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -717,7 +895,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 1
 	},
 	[17] = {
-	.act_hid = BNXT_ULP_ACT_HID_32ea,
+	.act_hid = BNXT_ULP_ACT_HID_19742,
 	.act_pattern_id = 16,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -726,7 +904,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 1
 	},
 	[18] = {
-	.act_hid = BNXT_ULP_ACT_HID_32f2,
+	.act_hid = BNXT_ULP_ACT_HID_19782,
 	.act_pattern_id = 17,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -736,7 +914,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 1
 	},
 	[19] = {
-	.act_hid = BNXT_ULP_ACT_HID_52ea,
+	.act_hid = BNXT_ULP_ACT_HID_29742,
 	.act_pattern_id = 18,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -746,7 +924,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 1
 	},
 	[20] = {
-	.act_hid = BNXT_ULP_ACT_HID_4c72,
+	.act_hid = BNXT_ULP_ACT_HID_26382,
 	.act_pattern_id = 19,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -756,7 +934,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 1
 	},
 	[21] = {
-	.act_hid = BNXT_ULP_ACT_HID_336a,
+	.act_hid = BNXT_ULP_ACT_HID_19b42,
 	.act_pattern_id = 20,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -766,7 +944,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 1
 	},
 	[22] = {
-	.act_hid = BNXT_ULP_ACT_HID_6c72,
+	.act_hid = BNXT_ULP_ACT_HID_36382,
 	.act_pattern_id = 21,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -777,7 +955,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 1
 	},
 	[23] = {
-	.act_hid = BNXT_ULP_ACT_HID_4cf2,
+	.act_hid = BNXT_ULP_ACT_HID_26782,
 	.act_pattern_id = 22,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -788,7 +966,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 1
 	},
 	[24] = {
-	.act_hid = BNXT_ULP_ACT_HID_32fa,
+	.act_hid = BNXT_ULP_ACT_HID_197c2,
 	.act_pattern_id = 23,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -798,7 +976,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 1
 	},
 	[25] = {
-	.act_hid = BNXT_ULP_ACT_HID_3302,
+	.act_hid = BNXT_ULP_ACT_HID_19802,
 	.act_pattern_id = 24,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -809,7 +987,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 1
 	},
 	[26] = {
-	.act_hid = BNXT_ULP_ACT_HID_52fa,
+	.act_hid = BNXT_ULP_ACT_HID_297c2,
 	.act_pattern_id = 25,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -820,7 +998,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 1
 	},
 	[27] = {
-	.act_hid = BNXT_ULP_ACT_HID_4c82,
+	.act_hid = BNXT_ULP_ACT_HID_26402,
 	.act_pattern_id = 26,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -831,7 +1009,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 1
 	},
 	[28] = {
-	.act_hid = BNXT_ULP_ACT_HID_337a,
+	.act_hid = BNXT_ULP_ACT_HID_19bc2,
 	.act_pattern_id = 27,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -842,7 +1020,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 1
 	},
 	[29] = {
-	.act_hid = BNXT_ULP_ACT_HID_6c82,
+	.act_hid = BNXT_ULP_ACT_HID_36402,
 	.act_pattern_id = 28,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -854,7 +1032,7 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 1
 	},
 	[30] = {
-	.act_hid = BNXT_ULP_ACT_HID_4d02,
+	.act_hid = BNXT_ULP_ACT_HID_26802,
 	.act_pattern_id = 29,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -866,727 +1044,723 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 1
 	},
 	[31] = {
-	.act_hid = BNXT_ULP_ACT_HID_0808,
+	.act_hid = BNXT_ULP_ACT_HID_bca0,
 	.act_pattern_id = 30,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_DROP |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 1
 	},
 	[32] = {
-	.act_hid = BNXT_ULP_ACT_HID_1008,
+	.act_hid = BNXT_ULP_ACT_HID_bce0,
 	.act_pattern_id = 31,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_DROP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 1
 	},
 	[33] = {
-	.act_hid = BNXT_ULP_ACT_HID_1808,
+	.act_hid = BNXT_ULP_ACT_HID_1bca0,
 	.act_pattern_id = 32,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_DROP |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_POP_VLAN |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 1
 	},
 	[34] = {
-	.act_hid = BNXT_ULP_ACT_HID_0818,
+	.act_hid = BNXT_ULP_ACT_HID_168e0,
 	.act_pattern_id = 33,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_COUNT |
-		BNXT_ULP_ACT_BIT_DROP |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 1
 	},
 	[35] = {
-	.act_hid = BNXT_ULP_ACT_HID_1018,
+	.act_hid = BNXT_ULP_ACT_HID_a0a0,
 	.act_pattern_id = 34,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_COUNT |
-		BNXT_ULP_ACT_BIT_DROP |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_VXLAN_DECAP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 1
 	},
 	[36] = {
-	.act_hid = BNXT_ULP_ACT_HID_1818,
+	.act_hid = BNXT_ULP_ACT_HID_268e0,
 	.act_pattern_id = 35,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_COUNT |
-		BNXT_ULP_ACT_BIT_DROP |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_POP_VLAN |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 1
 	},
 	[37] = {
-	.act_hid = BNXT_ULP_ACT_HID_0880,
+	.act_hid = BNXT_ULP_ACT_HID_16ce0,
 	.act_pattern_id = 36,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_VXLAN_DECAP |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 1
 	},
 	[38] = {
-	.act_hid = BNXT_ULP_ACT_HID_1080,
+	.act_hid = BNXT_ULP_ACT_HID_bd20,
 	.act_pattern_id = 37,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_VXLAN_DECAP |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 1
 	},
 	[39] = {
-	.act_hid = BNXT_ULP_ACT_HID_1880,
+	.act_hid = BNXT_ULP_ACT_HID_bd60,
 	.act_pattern_id = 38,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_VXLAN_DECAP |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_DROP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 1
 	},
 	[40] = {
-	.act_hid = BNXT_ULP_ACT_HID_0890,
+	.act_hid = BNXT_ULP_ACT_HID_1bd20,
 	.act_pattern_id = 39,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_COUNT |
-		BNXT_ULP_ACT_BIT_VXLAN_DECAP |
+		BNXT_ULP_ACT_BIT_POP_VLAN |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 1
 	},
 	[41] = {
-	.act_hid = BNXT_ULP_ACT_HID_1090,
+	.act_hid = BNXT_ULP_ACT_HID_16960,
 	.act_pattern_id = 40,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_COUNT |
-		BNXT_ULP_ACT_BIT_VXLAN_DECAP |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 1
 	},
 	[42] = {
-	.act_hid = BNXT_ULP_ACT_HID_1890,
+	.act_hid = BNXT_ULP_ACT_HID_a120,
 	.act_pattern_id = 41,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_VXLAN_DECAP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 1
 	},
 	[43] = {
-	.act_hid = BNXT_ULP_ACT_HID_3af2,
+	.act_hid = BNXT_ULP_ACT_HID_26960,
 	.act_pattern_id = 42,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_DROP |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_POP_VLAN |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 1
 	},
 	[44] = {
-	.act_hid = BNXT_ULP_ACT_HID_42f2,
+	.act_hid = BNXT_ULP_ACT_HID_16d60,
 	.act_pattern_id = 43,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_DROP |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_VXLAN_DECAP |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 1
 	},
 	[45] = {
-	.act_hid = BNXT_ULP_ACT_HID_4af2,
+	.act_hid = BNXT_ULP_ACT_HID_4040,
 	.act_pattern_id = 44,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DROP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 1
 	},
 	[46] = {
-	.act_hid = BNXT_ULP_ACT_HID_3b02,
+	.act_hid = BNXT_ULP_ACT_HID_8040,
 	.act_pattern_id = 45,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DROP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 1
 	},
 	[47] = {
-	.act_hid = BNXT_ULP_ACT_HID_4302,
+	.act_hid = BNXT_ULP_ACT_HID_c040,
 	.act_pattern_id = 46,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_DROP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 1
 	},
 	[48] = {
-	.act_hid = BNXT_ULP_ACT_HID_4b02,
+	.act_hid = BNXT_ULP_ACT_HID_40c0,
 	.act_pattern_id = 47,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_DROP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 1
 	},
 	[49] = {
-	.act_hid = BNXT_ULP_ACT_HID_3b6a,
+	.act_hid = BNXT_ULP_ACT_HID_80c0,
 	.act_pattern_id = 48,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_VXLAN_DECAP |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_DROP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 1
 	},
 	[50] = {
-	.act_hid = BNXT_ULP_ACT_HID_436a,
+	.act_hid = BNXT_ULP_ACT_HID_c0c0,
 	.act_pattern_id = 49,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_VXLAN_DECAP |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_DROP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 1
 	},
 	[51] = {
-	.act_hid = BNXT_ULP_ACT_HID_4b6a,
+	.act_hid = BNXT_ULP_ACT_HID_4400,
 	.act_pattern_id = 50,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_VXLAN_DECAP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 1
 	},
 	[52] = {
-	.act_hid = BNXT_ULP_ACT_HID_3b7a,
+	.act_hid = BNXT_ULP_ACT_HID_8400,
 	.act_pattern_id = 51,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_VXLAN_DECAP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 1
 	},
 	[53] = {
-	.act_hid = BNXT_ULP_ACT_HID_437a,
+	.act_hid = BNXT_ULP_ACT_HID_c400,
 	.act_pattern_id = 52,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_VXLAN_DECAP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 1
 	},
 	[54] = {
-	.act_hid = BNXT_ULP_ACT_HID_4b7a,
+	.act_hid = BNXT_ULP_ACT_HID_4480,
 	.act_pattern_id = 53,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_VXLAN_DECAP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 1
 	},
 	[55] = {
-	.act_hid = BNXT_ULP_ACT_HID_640d,
-	.act_pattern_id = 0,
+	.act_hid = BNXT_ULP_ACT_HID_8480,
+	.act_pattern_id = 54,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED |
-		BNXT_ULP_ACT_BIT_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_VXLAN_DECAP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
-	.act_tid = 2
+	.act_tid = 1
 	},
 	[56] = {
-	.act_hid = BNXT_ULP_ACT_HID_641d,
-	.act_pattern_id = 1,
+	.act_hid = BNXT_ULP_ACT_HID_c480,
+	.act_pattern_id = 55,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED |
-		BNXT_ULP_ACT_BIT_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_VXLAN_DECAP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
-	.act_tid = 2
+	.act_tid = 1
 	},
 	[57] = {
-	.act_hid = BNXT_ULP_ACT_HID_071a,
-	.act_pattern_id = 2,
+	.act_hid = BNXT_ULP_ACT_HID_1d782,
+	.act_pattern_id = 56,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_DELETE |
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_DROP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
-	.act_tid = 2
+	.act_tid = 1
 	},
 	[58] = {
-	.act_hid = BNXT_ULP_ACT_HID_0800,
-	.act_pattern_id = 0,
+	.act_hid = BNXT_ULP_ACT_HID_21782,
+	.act_pattern_id = 57,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DROP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
-	.act_tid = 3
+	.act_tid = 1
 	},
 	[59] = {
-	.act_hid = BNXT_ULP_ACT_HID_1000,
-	.act_pattern_id = 1,
+	.act_hid = BNXT_ULP_ACT_HID_25782,
+	.act_pattern_id = 58,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DROP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
-	.act_tid = 3
+	.act_tid = 1
 	},
 	[60] = {
-	.act_hid = BNXT_ULP_ACT_HID_1800,
-	.act_pattern_id = 2,
+	.act_hid = BNXT_ULP_ACT_HID_1d802,
+	.act_pattern_id = 59,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_DROP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
-	.act_tid = 3
+	.act_tid = 1
 	},
 	[61] = {
-	.act_hid = BNXT_ULP_ACT_HID_0810,
-	.act_pattern_id = 3,
+	.act_hid = BNXT_ULP_ACT_HID_21802,
+	.act_pattern_id = 60,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_COUNT |
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_DROP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
-	.act_tid = 3
+	.act_tid = 1
 	},
 	[62] = {
-	.act_hid = BNXT_ULP_ACT_HID_1010,
-	.act_pattern_id = 4,
+	.act_hid = BNXT_ULP_ACT_HID_25802,
+	.act_pattern_id = 61,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_DROP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
-	.act_tid = 3
+	.act_tid = 1
 	},
 	[63] = {
-	.act_hid = BNXT_ULP_ACT_HID_1810,
-	.act_pattern_id = 5,
+	.act_hid = BNXT_ULP_ACT_HID_1db42,
+	.act_pattern_id = 62,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_VXLAN_DECAP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
-	.act_tid = 3
+	.act_tid = 1
 	},
 	[64] = {
-	.act_hid = BNXT_ULP_ACT_HID_1110,
-	.act_pattern_id = 6,
+	.act_hid = BNXT_ULP_ACT_HID_21b42,
+	.act_pattern_id = 63,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_VXLAN_DECAP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
-	.act_tid = 3
+	.act_tid = 1
 	},
 	[65] = {
-	.act_hid = BNXT_ULP_ACT_HID_4420,
-	.act_pattern_id = 7,
+	.act_hid = BNXT_ULP_ACT_HID_25b42,
+	.act_pattern_id = 64,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_VXLAN_DECAP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
-	.act_tid = 3
+	.act_tid = 1
 	},
 	[66] = {
-	.act_hid = BNXT_ULP_ACT_HID_2220,
-	.act_pattern_id = 8,
+	.act_hid = BNXT_ULP_ACT_HID_1dbc2,
+	.act_pattern_id = 65,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_VXLAN_DECAP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
-	.act_tid = 3
+	.act_tid = 1
 	},
 	[67] = {
-	.act_hid = BNXT_ULP_ACT_HID_0c84,
-	.act_pattern_id = 9,
+	.act_hid = BNXT_ULP_ACT_HID_21bc2,
+	.act_pattern_id = 66,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
-		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_VXLAN_DECAP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
-	.act_tid = 3
+	.act_tid = 1
 	},
 	[68] = {
-	.act_hid = BNXT_ULP_ACT_HID_3f94,
-	.act_pattern_id = 10,
+	.act_hid = BNXT_ULP_ACT_HID_25bc2,
+	.act_pattern_id = 67,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
-		BNXT_ULP_ACT_BIT_SET_TP_SRC |
-		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_VXLAN_DECAP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
-	.act_tid = 3
+	.act_tid = 1
 	},
 	[69] = {
-	.act_hid = BNXT_ULP_ACT_HID_3330,
-	.act_pattern_id = 11,
+	.act_hid = BNXT_ULP_ACT_HID_fce0,
+	.act_pattern_id = 68,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_DROP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
-	.act_tid = 3
+	.act_tid = 1
 	},
 	[70] = {
-	.act_hid = BNXT_ULP_ACT_HID_50a4,
-	.act_pattern_id = 12,
+	.act_hid = BNXT_ULP_ACT_HID_13ce0,
+	.act_pattern_id = 69,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
-		BNXT_ULP_ACT_BIT_SET_TP_SRC |
-		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DROP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
-	.act_tid = 3
+	.act_tid = 1
 	},
 	[71] = {
-	.act_hid = BNXT_ULP_ACT_HID_1910,
-	.act_pattern_id = 13,
+	.act_hid = BNXT_ULP_ACT_HID_17ce0,
+	.act_pattern_id = 70,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DROP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
-	.act_tid = 3
+	.act_tid = 1
 	},
 	[72] = {
-	.act_hid = BNXT_ULP_ACT_HID_4c20,
-	.act_pattern_id = 14,
+	.act_hid = BNXT_ULP_ACT_HID_fd60,
+	.act_pattern_id = 71,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_DROP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
-	.act_tid = 3
+	.act_tid = 1
 	},
 	[73] = {
-	.act_hid = BNXT_ULP_ACT_HID_2a20,
-	.act_pattern_id = 15,
+	.act_hid = BNXT_ULP_ACT_HID_13d60,
+	.act_pattern_id = 72,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_DROP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
-	.act_tid = 3
+	.act_tid = 1
 	},
 	[74] = {
-	.act_hid = BNXT_ULP_ACT_HID_1484,
-	.act_pattern_id = 16,
+	.act_hid = BNXT_ULP_ACT_HID_17d60,
+	.act_pattern_id = 73,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
-		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_DROP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
-	.act_tid = 3
+	.act_tid = 1
 	},
 	[75] = {
-	.act_hid = BNXT_ULP_ACT_HID_4794,
-	.act_pattern_id = 17,
+	.act_hid = BNXT_ULP_ACT_HID_e0a0,
+	.act_pattern_id = 74,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
-		BNXT_ULP_ACT_BIT_SET_TP_SRC |
-		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_ACT_BIT_VXLAN_DECAP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
-	.act_tid = 3
+	.act_tid = 1
 	},
 	[76] = {
-	.act_hid = BNXT_ULP_ACT_HID_3b30,
-	.act_pattern_id = 18,
+	.act_hid = BNXT_ULP_ACT_HID_120a0,
+	.act_pattern_id = 75,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_VXLAN_DECAP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
-	.act_tid = 3
+	.act_tid = 1
 	},
 	[77] = {
-	.act_hid = BNXT_ULP_ACT_HID_58a4,
-	.act_pattern_id = 19,
+	.act_hid = BNXT_ULP_ACT_HID_160a0,
+	.act_pattern_id = 76,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
-		BNXT_ULP_ACT_BIT_SET_TP_SRC |
-		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_VXLAN_DECAP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
-	.act_tid = 3
+	.act_tid = 1
 	},
 	[78] = {
-	.act_hid = BNXT_ULP_ACT_HID_2110,
-	.act_pattern_id = 20,
+	.act_hid = BNXT_ULP_ACT_HID_e120,
+	.act_pattern_id = 77,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_VXLAN_DECAP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
-	.act_tid = 3
+	.act_tid = 1
 	},
 	[79] = {
-	.act_hid = BNXT_ULP_ACT_HID_5420,
-	.act_pattern_id = 21,
+	.act_hid = BNXT_ULP_ACT_HID_12120,
+	.act_pattern_id = 78,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_VXLAN_DECAP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
-	.act_tid = 3
+	.act_tid = 1
 	},
 	[80] = {
-	.act_hid = BNXT_ULP_ACT_HID_3220,
-	.act_pattern_id = 22,
+	.act_hid = BNXT_ULP_ACT_HID_16120,
+	.act_pattern_id = 79,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_VXLAN_DECAP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
-	.act_tid = 3
+	.act_tid = 1
 	},
 	[81] = {
-	.act_hid = BNXT_ULP_ACT_HID_1c84,
-	.act_pattern_id = 23,
+	.act_hid = BNXT_ULP_ACT_HID_32061,
+	.act_pattern_id = 0,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
-		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_ACT_BIT_SHARED |
+		BNXT_ULP_ACT_BIT_SAMPLE |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
-	.act_tid = 3
+	.act_tid = 2
 	},
 	[82] = {
-	.act_hid = BNXT_ULP_ACT_HID_4f94,
-	.act_pattern_id = 24,
+	.act_hid = BNXT_ULP_ACT_HID_320e1,
+	.act_pattern_id = 1,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
-		BNXT_ULP_ACT_BIT_SET_TP_SRC |
-		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_ACT_BIT_SHARED |
+		BNXT_ULP_ACT_BIT_SAMPLE |
+		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
-	.act_tid = 3
+	.act_tid = 2
 	},
 	[83] = {
-	.act_hid = BNXT_ULP_ACT_HID_4330,
-	.act_pattern_id = 25,
+	.act_hid = BNXT_ULP_ACT_HID_388a,
+	.act_pattern_id = 2,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_DELETE |
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
-	.act_tid = 3
+	.act_tid = 2
 	},
 	[84] = {
-	.act_hid = BNXT_ULP_ACT_HID_60a4,
-	.act_pattern_id = 26,
+	.act_hid = BNXT_ULP_ACT_HID_4000,
+	.act_pattern_id = 0,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
-		BNXT_ULP_ACT_BIT_SET_TP_SRC |
-		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[85] = {
-	.act_hid = BNXT_ULP_ACT_HID_2910,
-	.act_pattern_id = 27,
+	.act_hid = BNXT_ULP_ACT_HID_8000,
+	.act_pattern_id = 1,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[86] = {
-	.act_hid = BNXT_ULP_ACT_HID_5c20,
-	.act_pattern_id = 28,
+	.act_hid = BNXT_ULP_ACT_HID_c000,
+	.act_pattern_id = 2,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[87] = {
-	.act_hid = BNXT_ULP_ACT_HID_3a20,
-	.act_pattern_id = 29,
+	.act_hid = BNXT_ULP_ACT_HID_4080,
+	.act_pattern_id = 3,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[88] = {
-	.act_hid = BNXT_ULP_ACT_HID_2484,
-	.act_pattern_id = 30,
+	.act_hid = BNXT_ULP_ACT_HID_8080,
+	.act_pattern_id = 4,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
-		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[89] = {
-	.act_hid = BNXT_ULP_ACT_HID_5794,
-	.act_pattern_id = 31,
+	.act_hid = BNXT_ULP_ACT_HID_c080,
+	.act_pattern_id = 5,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
-		BNXT_ULP_ACT_BIT_SET_TP_SRC |
-		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[90] = {
-	.act_hid = BNXT_ULP_ACT_HID_4b30,
-	.act_pattern_id = 32,
+	.act_hid = BNXT_ULP_ACT_HID_8880,
+	.act_pattern_id = 6,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[91] = {
-	.act_hid = BNXT_ULP_ACT_HID_68a4,
-	.act_pattern_id = 33,
+	.act_hid = BNXT_ULP_ACT_HID_22100,
+	.act_pattern_id = 7,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
-		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[92] = {
-	.act_hid = BNXT_ULP_ACT_HID_1120,
-	.act_pattern_id = 34,
+	.act_hid = BNXT_ULP_ACT_HID_11100,
+	.act_pattern_id = 8,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_COUNT |
-		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[93] = {
-	.act_hid = BNXT_ULP_ACT_HID_4430,
-	.act_pattern_id = 35,
+	.act_hid = BNXT_ULP_ACT_HID_6420,
+	.act_pattern_id = 9,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_COUNT |
-		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[94] = {
-	.act_hid = BNXT_ULP_ACT_HID_2230,
-	.act_pattern_id = 36,
+	.act_hid = BNXT_ULP_ACT_HID_1fca0,
+	.act_pattern_id = 10,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[95] = {
-	.act_hid = BNXT_ULP_ACT_HID_0c94,
-	.act_pattern_id = 37,
+	.act_hid = BNXT_ULP_ACT_HID_19980,
+	.act_pattern_id = 11,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
-		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[96] = {
-	.act_hid = BNXT_ULP_ACT_HID_3fa4,
-	.act_pattern_id = 38,
+	.act_hid = BNXT_ULP_ACT_HID_28520,
+	.act_pattern_id = 12,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_ACT_BIT_SET_TP_DST |
@@ -1594,82 +1768,77 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 3
 	},
 	[97] = {
-	.act_hid = BNXT_ULP_ACT_HID_3340,
-	.act_pattern_id = 39,
+	.act_hid = BNXT_ULP_ACT_HID_c880,
+	.act_pattern_id = 13,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[98] = {
-	.act_hid = BNXT_ULP_ACT_HID_50b4,
-	.act_pattern_id = 40,
+	.act_hid = BNXT_ULP_ACT_HID_26100,
+	.act_pattern_id = 14,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
-		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[99] = {
-	.act_hid = BNXT_ULP_ACT_HID_1920,
-	.act_pattern_id = 41,
+	.act_hid = BNXT_ULP_ACT_HID_15100,
+	.act_pattern_id = 15,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_COUNT |
-		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[100] = {
-	.act_hid = BNXT_ULP_ACT_HID_4c30,
-	.act_pattern_id = 42,
+	.act_hid = BNXT_ULP_ACT_HID_a420,
+	.act_pattern_id = 16,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_COUNT |
-		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[101] = {
-	.act_hid = BNXT_ULP_ACT_HID_2a30,
-	.act_pattern_id = 43,
+	.act_hid = BNXT_ULP_ACT_HID_23ca0,
+	.act_pattern_id = 17,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[102] = {
-	.act_hid = BNXT_ULP_ACT_HID_1494,
-	.act_pattern_id = 44,
+	.act_hid = BNXT_ULP_ACT_HID_1d980,
+	.act_pattern_id = 18,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
-		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[103] = {
-	.act_hid = BNXT_ULP_ACT_HID_47a4,
-	.act_pattern_id = 45,
+	.act_hid = BNXT_ULP_ACT_HID_2c520,
+	.act_pattern_id = 19,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_ACT_BIT_SET_TP_DST |
@@ -1677,84 +1846,77 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 3
 	},
 	[104] = {
-	.act_hid = BNXT_ULP_ACT_HID_3b40,
-	.act_pattern_id = 46,
+	.act_hid = BNXT_ULP_ACT_HID_10880,
+	.act_pattern_id = 20,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[105] = {
-	.act_hid = BNXT_ULP_ACT_HID_58b4,
-	.act_pattern_id = 47,
+	.act_hid = BNXT_ULP_ACT_HID_2a100,
+	.act_pattern_id = 21,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
-		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[106] = {
-	.act_hid = BNXT_ULP_ACT_HID_2120,
-	.act_pattern_id = 48,
+	.act_hid = BNXT_ULP_ACT_HID_19100,
+	.act_pattern_id = 22,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_COUNT |
-		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[107] = {
-	.act_hid = BNXT_ULP_ACT_HID_5430,
-	.act_pattern_id = 49,
+	.act_hid = BNXT_ULP_ACT_HID_e420,
+	.act_pattern_id = 23,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_COUNT |
-		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[108] = {
-	.act_hid = BNXT_ULP_ACT_HID_3230,
-	.act_pattern_id = 50,
+	.act_hid = BNXT_ULP_ACT_HID_27ca0,
+	.act_pattern_id = 24,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[109] = {
-	.act_hid = BNXT_ULP_ACT_HID_1c94,
-	.act_pattern_id = 51,
+	.act_hid = BNXT_ULP_ACT_HID_21980,
+	.act_pattern_id = 25,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
-		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[110] = {
-	.act_hid = BNXT_ULP_ACT_HID_4fa4,
-	.act_pattern_id = 52,
+	.act_hid = BNXT_ULP_ACT_HID_30520,
+	.act_pattern_id = 26,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_ACT_BIT_SET_TP_DST |
@@ -1762,89 +1924,84 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 3
 	},
 	[111] = {
-	.act_hid = BNXT_ULP_ACT_HID_4340,
-	.act_pattern_id = 53,
+	.act_hid = BNXT_ULP_ACT_HID_14880,
+	.act_pattern_id = 27,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[112] = {
-	.act_hid = BNXT_ULP_ACT_HID_60b4,
-	.act_pattern_id = 54,
+	.act_hid = BNXT_ULP_ACT_HID_2e100,
+	.act_pattern_id = 28,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
-		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[113] = {
-	.act_hid = BNXT_ULP_ACT_HID_2920,
-	.act_pattern_id = 55,
+	.act_hid = BNXT_ULP_ACT_HID_1d100,
+	.act_pattern_id = 29,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_COUNT |
-		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[114] = {
-	.act_hid = BNXT_ULP_ACT_HID_5c30,
-	.act_pattern_id = 56,
+	.act_hid = BNXT_ULP_ACT_HID_12420,
+	.act_pattern_id = 30,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_COUNT |
-		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[115] = {
-	.act_hid = BNXT_ULP_ACT_HID_3a30,
-	.act_pattern_id = 57,
+	.act_hid = BNXT_ULP_ACT_HID_2bca0,
+	.act_pattern_id = 31,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[116] = {
-	.act_hid = BNXT_ULP_ACT_HID_2494,
-	.act_pattern_id = 58,
+	.act_hid = BNXT_ULP_ACT_HID_25980,
+	.act_pattern_id = 32,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
-		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[117] = {
-	.act_hid = BNXT_ULP_ACT_HID_57a4,
-	.act_pattern_id = 59,
+	.act_hid = BNXT_ULP_ACT_HID_34520,
+	.act_pattern_id = 33,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_ACT_BIT_SET_TP_DST |
@@ -1852,81 +2009,77 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 3
 	},
 	[118] = {
-	.act_hid = BNXT_ULP_ACT_HID_4b40,
-	.act_pattern_id = 60,
+	.act_hid = BNXT_ULP_ACT_HID_8900,
+	.act_pattern_id = 34,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[119] = {
-	.act_hid = BNXT_ULP_ACT_HID_68b4,
-	.act_pattern_id = 61,
+	.act_hid = BNXT_ULP_ACT_HID_22180,
+	.act_pattern_id = 35,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
-		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[120] = {
-	.act_hid = BNXT_ULP_ACT_HID_2a98,
-	.act_pattern_id = 62,
+	.act_hid = BNXT_ULP_ACT_HID_11180,
+	.act_pattern_id = 36,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_DEC_TTL |
-		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[121] = {
-	.act_hid = BNXT_ULP_ACT_HID_5da8,
-	.act_pattern_id = 63,
+	.act_hid = BNXT_ULP_ACT_HID_64a0,
+	.act_pattern_id = 37,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_DEC_TTL |
-		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[122] = {
-	.act_hid = BNXT_ULP_ACT_HID_3ba8,
-	.act_pattern_id = 64,
+	.act_hid = BNXT_ULP_ACT_HID_1fd20,
+	.act_pattern_id = 38,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[123] = {
-	.act_hid = BNXT_ULP_ACT_HID_260c,
-	.act_pattern_id = 65,
+	.act_hid = BNXT_ULP_ACT_HID_19a00,
+	.act_pattern_id = 39,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
-		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[124] = {
-	.act_hid = BNXT_ULP_ACT_HID_591c,
-	.act_pattern_id = 66,
+	.act_hid = BNXT_ULP_ACT_HID_285a0,
+	.act_pattern_id = 40,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_ACT_BIT_SET_TP_DST |
@@ -1934,83 +2087,82 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 3
 	},
 	[125] = {
-	.act_hid = BNXT_ULP_ACT_HID_6a2c,
-	.act_pattern_id = 67,
+	.act_hid = BNXT_ULP_ACT_HID_c900,
+	.act_pattern_id = 41,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
-		BNXT_ULP_ACT_BIT_SET_TP_SRC |
-		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[126] = {
-	.act_hid = BNXT_ULP_ACT_HID_2aa8,
-	.act_pattern_id = 68,
+	.act_hid = BNXT_ULP_ACT_HID_26180,
+	.act_pattern_id = 42,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[127] = {
-	.act_hid = BNXT_ULP_ACT_HID_5db8,
-	.act_pattern_id = 69,
+	.act_hid = BNXT_ULP_ACT_HID_15180,
+	.act_pattern_id = 43,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_COUNT |
-		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[128] = {
-	.act_hid = BNXT_ULP_ACT_HID_3bb8,
-	.act_pattern_id = 70,
+	.act_hid = BNXT_ULP_ACT_HID_a4a0,
+	.act_pattern_id = 44,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[129] = {
-	.act_hid = BNXT_ULP_ACT_HID_261c,
-	.act_pattern_id = 71,
+	.act_hid = BNXT_ULP_ACT_HID_23d20,
+	.act_pattern_id = 45,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[130] = {
-	.act_hid = BNXT_ULP_ACT_HID_592c,
-	.act_pattern_id = 72,
+	.act_hid = BNXT_ULP_ACT_HID_1da00,
+	.act_pattern_id = 46,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
-		BNXT_ULP_ACT_BIT_SET_TP_SRC |
-		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[131] = {
-	.act_hid = BNXT_ULP_ACT_HID_6a3c,
-	.act_pattern_id = 73,
+	.act_hid = BNXT_ULP_ACT_HID_2c5a0,
+	.act_pattern_id = 47,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
@@ -2020,58 +2172,58 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 3
 	},
 	[132] = {
-	.act_hid = BNXT_ULP_ACT_HID_3298,
-	.act_pattern_id = 74,
+	.act_hid = BNXT_ULP_ACT_HID_10900,
+	.act_pattern_id = 48,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[133] = {
-	.act_hid = BNXT_ULP_ACT_HID_65a8,
-	.act_pattern_id = 75,
+	.act_hid = BNXT_ULP_ACT_HID_2a180,
+	.act_pattern_id = 49,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[134] = {
-	.act_hid = BNXT_ULP_ACT_HID_43a8,
-	.act_pattern_id = 76,
+	.act_hid = BNXT_ULP_ACT_HID_19180,
+	.act_pattern_id = 50,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[135] = {
-	.act_hid = BNXT_ULP_ACT_HID_2e0c,
-	.act_pattern_id = 77,
+	.act_hid = BNXT_ULP_ACT_HID_e4a0,
+	.act_pattern_id = 51,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[136] = {
-	.act_hid = BNXT_ULP_ACT_HID_611c,
-	.act_pattern_id = 78,
+	.act_hid = BNXT_ULP_ACT_HID_27d20,
+	.act_pattern_id = 52,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_ACT_BIT_SET_TP_DST |
@@ -2079,92 +2231,89 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 3
 	},
 	[137] = {
-	.act_hid = BNXT_ULP_ACT_HID_722c,
-	.act_pattern_id = 79,
+	.act_hid = BNXT_ULP_ACT_HID_21a00,
+	.act_pattern_id = 53,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
-		BNXT_ULP_ACT_BIT_SET_TP_SRC |
-		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[138] = {
-	.act_hid = BNXT_ULP_ACT_HID_32a8,
-	.act_pattern_id = 80,
+	.act_hid = BNXT_ULP_ACT_HID_305a0,
+	.act_pattern_id = 54,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[139] = {
-	.act_hid = BNXT_ULP_ACT_HID_65b8,
-	.act_pattern_id = 81,
+	.act_hid = BNXT_ULP_ACT_HID_14900,
+	.act_pattern_id = 55,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[140] = {
-	.act_hid = BNXT_ULP_ACT_HID_43b8,
-	.act_pattern_id = 82,
+	.act_hid = BNXT_ULP_ACT_HID_2e180,
+	.act_pattern_id = 56,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_COUNT |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[141] = {
-	.act_hid = BNXT_ULP_ACT_HID_2e1c,
-	.act_pattern_id = 83,
+	.act_hid = BNXT_ULP_ACT_HID_1d180,
+	.act_pattern_id = 57,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
-		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[142] = {
-	.act_hid = BNXT_ULP_ACT_HID_612c,
-	.act_pattern_id = 84,
+	.act_hid = BNXT_ULP_ACT_HID_124a0,
+	.act_pattern_id = 58,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
-		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[143] = {
-	.act_hid = BNXT_ULP_ACT_HID_723c,
-	.act_pattern_id = 85,
+	.act_hid = BNXT_ULP_ACT_HID_2bd20,
+	.act_pattern_id = 59,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_COUNT |
-		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_ACT_BIT_SET_TP_DST |
@@ -2172,57 +2321,80 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 3
 	},
 	[144] = {
-	.act_hid = BNXT_ULP_ACT_HID_3a98,
-	.act_pattern_id = 86,
+	.act_hid = BNXT_ULP_ACT_HID_25a00,
+	.act_pattern_id = 60,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[145] = {
-	.act_hid = BNXT_ULP_ACT_HID_6da8,
-	.act_pattern_id = 87,
+	.act_hid = BNXT_ULP_ACT_HID_345a0,
+	.act_pattern_id = 61,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[146] = {
-	.act_hid = BNXT_ULP_ACT_HID_4ba8,
-	.act_pattern_id = 88,
+	.act_hid = BNXT_ULP_ACT_HID_154c0,
+	.act_pattern_id = 62,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[147] = {
-	.act_hid = BNXT_ULP_ACT_HID_360c,
-	.act_pattern_id = 89,
+	.act_hid = BNXT_ULP_ACT_HID_2ed40,
+	.act_pattern_id = 63,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 3
+	},
+	[148] = {
+	.act_hid = BNXT_ULP_ACT_HID_1dd40,
+	.act_pattern_id = 64,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 3
+	},
+	[149] = {
+	.act_hid = BNXT_ULP_ACT_HID_13060,
+	.act_pattern_id = 65,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
-	[148] = {
-	.act_hid = BNXT_ULP_ACT_HID_691c,
-	.act_pattern_id = 90,
+	[150] = {
+	.act_hid = BNXT_ULP_ACT_HID_2c8e0,
+	.act_pattern_id = 66,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
@@ -2230,12 +2402,11 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
-	[149] = {
-	.act_hid = BNXT_ULP_ACT_HID_7a2c,
-	.act_pattern_id = 91,
+	[151] = {
+	.act_hid = BNXT_ULP_ACT_HID_35160,
+	.act_pattern_id = 67,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
@@ -2244,24 +2415,22 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
-	[150] = {
-	.act_hid = BNXT_ULP_ACT_HID_3aa8,
-	.act_pattern_id = 92,
+	[152] = {
+	.act_hid = BNXT_ULP_ACT_HID_15540,
+	.act_pattern_id = 68,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
-	[151] = {
-	.act_hid = BNXT_ULP_ACT_HID_6db8,
-	.act_pattern_id = 93,
+	[153] = {
+	.act_hid = BNXT_ULP_ACT_HID_2edc0,
+	.act_pattern_id = 69,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
@@ -2269,24 +2438,22 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
-	[152] = {
-	.act_hid = BNXT_ULP_ACT_HID_4bb8,
-	.act_pattern_id = 94,
+	[154] = {
+	.act_hid = BNXT_ULP_ACT_HID_1ddc0,
+	.act_pattern_id = 70,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
-	[153] = {
-	.act_hid = BNXT_ULP_ACT_HID_361c,
-	.act_pattern_id = 95,
+	[155] = {
+	.act_hid = BNXT_ULP_ACT_HID_130e0,
+	.act_pattern_id = 71,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
@@ -2294,12 +2461,11 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
-	[154] = {
-	.act_hid = BNXT_ULP_ACT_HID_692c,
-	.act_pattern_id = 96,
+	[156] = {
+	.act_hid = BNXT_ULP_ACT_HID_2c960,
+	.act_pattern_id = 72,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
@@ -2308,12 +2474,11 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
-	[155] = {
-	.act_hid = BNXT_ULP_ACT_HID_7a3c,
-	.act_pattern_id = 97,
+	[157] = {
+	.act_hid = BNXT_ULP_ACT_HID_351e0,
+	.act_pattern_id = 73,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
@@ -2323,63 +2488,58 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
-	[156] = {
-	.act_hid = BNXT_ULP_ACT_HID_4298,
-	.act_pattern_id = 98,
+	[158] = {
+	.act_hid = BNXT_ULP_ACT_HID_194c0,
+	.act_pattern_id = 74,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
-	[157] = {
-	.act_hid = BNXT_ULP_ACT_HID_75a8,
-	.act_pattern_id = 99,
+	[159] = {
+	.act_hid = BNXT_ULP_ACT_HID_32d40,
+	.act_pattern_id = 75,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
-	[158] = {
-	.act_hid = BNXT_ULP_ACT_HID_53a8,
-	.act_pattern_id = 100,
+	[160] = {
+	.act_hid = BNXT_ULP_ACT_HID_21d40,
+	.act_pattern_id = 76,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
-	[159] = {
-	.act_hid = BNXT_ULP_ACT_HID_3e0c,
-	.act_pattern_id = 101,
+	[161] = {
+	.act_hid = BNXT_ULP_ACT_HID_17060,
+	.act_pattern_id = 77,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
-	[160] = {
-	.act_hid = BNXT_ULP_ACT_HID_711c,
-	.act_pattern_id = 102,
+	[162] = {
+	.act_hid = BNXT_ULP_ACT_HID_308e0,
+	.act_pattern_id = 78,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
@@ -2387,13 +2547,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
-	[161] = {
-	.act_hid = BNXT_ULP_ACT_HID_0670,
-	.act_pattern_id = 103,
+	[163] = {
+	.act_hid = BNXT_ULP_ACT_HID_39160,
+	.act_pattern_id = 79,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
@@ -2402,26 +2561,24 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
-	[162] = {
-	.act_hid = BNXT_ULP_ACT_HID_42a8,
-	.act_pattern_id = 104,
+	[164] = {
+	.act_hid = BNXT_ULP_ACT_HID_19540,
+	.act_pattern_id = 80,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
-	[163] = {
-	.act_hid = BNXT_ULP_ACT_HID_75b8,
-	.act_pattern_id = 105,
+	[165] = {
+	.act_hid = BNXT_ULP_ACT_HID_32dc0,
+	.act_pattern_id = 81,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
@@ -2429,26 +2586,24 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
-	[164] = {
-	.act_hid = BNXT_ULP_ACT_HID_53b8,
-	.act_pattern_id = 106,
+	[166] = {
+	.act_hid = BNXT_ULP_ACT_HID_21dc0,
+	.act_pattern_id = 82,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
-	[165] = {
-	.act_hid = BNXT_ULP_ACT_HID_3e1c,
-	.act_pattern_id = 107,
+	[167] = {
+	.act_hid = BNXT_ULP_ACT_HID_170e0,
+	.act_pattern_id = 83,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
@@ -2456,13 +2611,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
-	[166] = {
-	.act_hid = BNXT_ULP_ACT_HID_712c,
-	.act_pattern_id = 108,
+	[168] = {
+	.act_hid = BNXT_ULP_ACT_HID_30960,
+	.act_pattern_id = 84,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
@@ -2471,13 +2625,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
-	[167] = {
-	.act_hid = BNXT_ULP_ACT_HID_0680,
-	.act_pattern_id = 109,
+	[169] = {
+	.act_hid = BNXT_ULP_ACT_HID_391e0,
+	.act_pattern_id = 85,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
@@ -2487,143 +2640,137 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
-	[168] = {
-	.act_hid = BNXT_ULP_ACT_HID_3aea,
-	.act_pattern_id = 110,
-	.app_sig = 0,
-	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_FLOW_DIR_BITMASK_ING },
-	.act_tid = 3
-	},
-	[169] = {
-	.act_hid = BNXT_ULP_ACT_HID_42ea,
-	.act_pattern_id = 111,
-	.app_sig = 0,
-	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_FLOW_DIR_BITMASK_ING },
-	.act_tid = 3
-	},
 	[170] = {
-	.act_hid = BNXT_ULP_ACT_HID_4aea,
-	.act_pattern_id = 112,
+	.act_hid = BNXT_ULP_ACT_HID_1d4c0,
+	.act_pattern_id = 86,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[171] = {
-	.act_hid = BNXT_ULP_ACT_HID_3afa,
-	.act_pattern_id = 113,
+	.act_hid = BNXT_ULP_ACT_HID_36d40,
+	.act_pattern_id = 87,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_COUNT |
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[172] = {
-	.act_hid = BNXT_ULP_ACT_HID_42fa,
-	.act_pattern_id = 114,
+	.act_hid = BNXT_ULP_ACT_HID_25d40,
+	.act_pattern_id = 88,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[173] = {
-	.act_hid = BNXT_ULP_ACT_HID_4afa,
-	.act_pattern_id = 115,
+	.act_hid = BNXT_ULP_ACT_HID_1b060,
+	.act_pattern_id = 89,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_COUNT |
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[174] = {
-	.act_hid = BNXT_ULP_ACT_HID_43fa,
-	.act_pattern_id = 116,
+	.act_hid = BNXT_ULP_ACT_HID_348e0,
+	.act_pattern_id = 90,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[175] = {
-	.act_hid = BNXT_ULP_ACT_HID_770a,
-	.act_pattern_id = 117,
+	.act_hid = BNXT_ULP_ACT_HID_3d160,
+	.act_pattern_id = 91,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[176] = {
-	.act_hid = BNXT_ULP_ACT_HID_550a,
-	.act_pattern_id = 118,
+	.act_hid = BNXT_ULP_ACT_HID_1d540,
+	.act_pattern_id = 92,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[177] = {
-	.act_hid = BNXT_ULP_ACT_HID_3f6e,
-	.act_pattern_id = 119,
+	.act_hid = BNXT_ULP_ACT_HID_36dc0,
+	.act_pattern_id = 93,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
-		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[178] = {
-	.act_hid = BNXT_ULP_ACT_HID_727e,
-	.act_pattern_id = 120,
+	.act_hid = BNXT_ULP_ACT_HID_25dc0,
+	.act_pattern_id = 94,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
-		BNXT_ULP_ACT_BIT_SET_TP_SRC |
-		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[179] = {
-	.act_hid = BNXT_ULP_ACT_HID_661a,
-	.act_pattern_id = 121,
+	.act_hid = BNXT_ULP_ACT_HID_1b0e0,
+	.act_pattern_id = 95,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[180] = {
-	.act_hid = BNXT_ULP_ACT_HID_07d2,
-	.act_pattern_id = 122,
+	.act_hid = BNXT_ULP_ACT_HID_34960,
+	.act_pattern_id = 96,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_ACT_BIT_SET_TP_DST |
@@ -2631,83 +2778,92 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 3
 	},
 	[181] = {
-	.act_hid = BNXT_ULP_ACT_HID_4bfa,
-	.act_pattern_id = 123,
+	.act_hid = BNXT_ULP_ACT_HID_3d1e0,
+	.act_pattern_id = 97,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[182] = {
-	.act_hid = BNXT_ULP_ACT_HID_034e,
-	.act_pattern_id = 124,
+	.act_hid = BNXT_ULP_ACT_HID_214c0,
+	.act_pattern_id = 98,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[183] = {
-	.act_hid = BNXT_ULP_ACT_HID_5d0a,
-	.act_pattern_id = 125,
+	.act_hid = BNXT_ULP_ACT_HID_3ad40,
+	.act_pattern_id = 99,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[184] = {
-	.act_hid = BNXT_ULP_ACT_HID_476e,
-	.act_pattern_id = 126,
+	.act_hid = BNXT_ULP_ACT_HID_29d40,
+	.act_pattern_id = 100,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
-		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[185] = {
-	.act_hid = BNXT_ULP_ACT_HID_7a7e,
-	.act_pattern_id = 127,
+	.act_hid = BNXT_ULP_ACT_HID_1f060,
+	.act_pattern_id = 101,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
-		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[186] = {
-	.act_hid = BNXT_ULP_ACT_HID_6e1a,
-	.act_pattern_id = 128,
+	.act_hid = BNXT_ULP_ACT_HID_388e0,
+	.act_pattern_id = 102,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[187] = {
-	.act_hid = BNXT_ULP_ACT_HID_0fd2,
-	.act_pattern_id = 129,
+	.act_hid = BNXT_ULP_ACT_HID_3380,
+	.act_pattern_id = 103,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
@@ -2716,58 +2872,68 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 3
 	},
 	[188] = {
-	.act_hid = BNXT_ULP_ACT_HID_53fa,
-	.act_pattern_id = 130,
+	.act_hid = BNXT_ULP_ACT_HID_21540,
+	.act_pattern_id = 104,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[189] = {
-	.act_hid = BNXT_ULP_ACT_HID_0b4e,
-	.act_pattern_id = 131,
+	.act_hid = BNXT_ULP_ACT_HID_3adc0,
+	.act_pattern_id = 105,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[190] = {
-	.act_hid = BNXT_ULP_ACT_HID_650a,
-	.act_pattern_id = 132,
+	.act_hid = BNXT_ULP_ACT_HID_29dc0,
+	.act_pattern_id = 106,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[191] = {
-	.act_hid = BNXT_ULP_ACT_HID_4f6e,
-	.act_pattern_id = 133,
+	.act_hid = BNXT_ULP_ACT_HID_1f0e0,
+	.act_pattern_id = 107,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[192] = {
-	.act_hid = BNXT_ULP_ACT_HID_06c2,
-	.act_pattern_id = 134,
+	.act_hid = BNXT_ULP_ACT_HID_38960,
+	.act_pattern_id = 108,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_ACT_BIT_SET_TP_DST |
@@ -2775,176 +2941,158 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 3
 	},
 	[193] = {
-	.act_hid = BNXT_ULP_ACT_HID_761a,
-	.act_pattern_id = 135,
+	.act_hid = BNXT_ULP_ACT_HID_3400,
+	.act_pattern_id = 109,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[194] = {
-	.act_hid = BNXT_ULP_ACT_HID_17d2,
-	.act_pattern_id = 136,
+	.act_hid = BNXT_ULP_ACT_HID_1d742,
+	.act_pattern_id = 110,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
-		BNXT_ULP_ACT_BIT_SET_TP_SRC |
-		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[195] = {
-	.act_hid = BNXT_ULP_ACT_HID_5bfa,
-	.act_pattern_id = 137,
+	.act_hid = BNXT_ULP_ACT_HID_21742,
+	.act_pattern_id = 111,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[196] = {
-	.act_hid = BNXT_ULP_ACT_HID_134e,
-	.act_pattern_id = 138,
+	.act_hid = BNXT_ULP_ACT_HID_25742,
+	.act_pattern_id = 112,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[197] = {
-	.act_hid = BNXT_ULP_ACT_HID_6d0a,
-	.act_pattern_id = 139,
+	.act_hid = BNXT_ULP_ACT_HID_1d7c2,
+	.act_pattern_id = 113,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[198] = {
-	.act_hid = BNXT_ULP_ACT_HID_576e,
-	.act_pattern_id = 140,
+	.act_hid = BNXT_ULP_ACT_HID_217c2,
+	.act_pattern_id = 114,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
-		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[199] = {
-	.act_hid = BNXT_ULP_ACT_HID_0ec2,
-	.act_pattern_id = 141,
+	.act_hid = BNXT_ULP_ACT_HID_257c2,
+	.act_pattern_id = 115,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
-		BNXT_ULP_ACT_BIT_SET_TP_SRC |
-		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[200] = {
-	.act_hid = BNXT_ULP_ACT_HID_025e,
-	.act_pattern_id = 142,
+	.act_hid = BNXT_ULP_ACT_HID_21fc2,
+	.act_pattern_id = 116,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[201] = {
-	.act_hid = BNXT_ULP_ACT_HID_1fd2,
-	.act_pattern_id = 143,
+	.act_hid = BNXT_ULP_ACT_HID_3b842,
+	.act_pattern_id = 117,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
-		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[202] = {
-	.act_hid = BNXT_ULP_ACT_HID_440a,
-	.act_pattern_id = 144,
+	.act_hid = BNXT_ULP_ACT_HID_2a842,
+	.act_pattern_id = 118,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_COUNT |
-		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[203] = {
-	.act_hid = BNXT_ULP_ACT_HID_771a,
-	.act_pattern_id = 145,
+	.act_hid = BNXT_ULP_ACT_HID_1fb62,
+	.act_pattern_id = 119,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_COUNT |
-		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[204] = {
-	.act_hid = BNXT_ULP_ACT_HID_551a,
-	.act_pattern_id = 146,
+	.act_hid = BNXT_ULP_ACT_HID_393e2,
+	.act_pattern_id = 120,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[205] = {
-	.act_hid = BNXT_ULP_ACT_HID_3f7e,
-	.act_pattern_id = 147,
+	.act_hid = BNXT_ULP_ACT_HID_330c2,
+	.act_pattern_id = 121,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
-		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[206] = {
-	.act_hid = BNXT_ULP_ACT_HID_728e,
-	.act_pattern_id = 148,
+	.act_hid = BNXT_ULP_ACT_HID_3e82,
+	.act_pattern_id = 122,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_ACT_BIT_SET_TP_DST |
@@ -2952,89 +3100,84 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 3
 	},
 	[207] = {
-	.act_hid = BNXT_ULP_ACT_HID_662a,
-	.act_pattern_id = 149,
+	.act_hid = BNXT_ULP_ACT_HID_25fc2,
+	.act_pattern_id = 123,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[208] = {
-	.act_hid = BNXT_ULP_ACT_HID_07e2,
-	.act_pattern_id = 150,
+	.act_hid = BNXT_ULP_ACT_HID_1a62,
+	.act_pattern_id = 124,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
-		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[209] = {
-	.act_hid = BNXT_ULP_ACT_HID_4c0a,
-	.act_pattern_id = 151,
+	.act_hid = BNXT_ULP_ACT_HID_2e842,
+	.act_pattern_id = 125,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_COUNT |
-		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[210] = {
-	.act_hid = BNXT_ULP_ACT_HID_035e,
-	.act_pattern_id = 152,
+	.act_hid = BNXT_ULP_ACT_HID_23b62,
+	.act_pattern_id = 126,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_COUNT |
-		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[211] = {
-	.act_hid = BNXT_ULP_ACT_HID_5d1a,
-	.act_pattern_id = 153,
+	.act_hid = BNXT_ULP_ACT_HID_3d3e2,
+	.act_pattern_id = 127,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[212] = {
-	.act_hid = BNXT_ULP_ACT_HID_477e,
-	.act_pattern_id = 154,
+	.act_hid = BNXT_ULP_ACT_HID_370c2,
+	.act_pattern_id = 128,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
-		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[213] = {
-	.act_hid = BNXT_ULP_ACT_HID_7a8e,
-	.act_pattern_id = 155,
+	.act_hid = BNXT_ULP_ACT_HID_7e82,
+	.act_pattern_id = 129,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_ACT_BIT_SET_TP_DST |
@@ -3042,91 +3185,84 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 3
 	},
 	[214] = {
-	.act_hid = BNXT_ULP_ACT_HID_6e2a,
-	.act_pattern_id = 156,
+	.act_hid = BNXT_ULP_ACT_HID_29fc2,
+	.act_pattern_id = 130,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[215] = {
-	.act_hid = BNXT_ULP_ACT_HID_0fe2,
-	.act_pattern_id = 157,
+	.act_hid = BNXT_ULP_ACT_HID_5a62,
+	.act_pattern_id = 131,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
-		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[216] = {
-	.act_hid = BNXT_ULP_ACT_HID_540a,
-	.act_pattern_id = 158,
+	.act_hid = BNXT_ULP_ACT_HID_32842,
+	.act_pattern_id = 132,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_COUNT |
-		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[217] = {
-	.act_hid = BNXT_ULP_ACT_HID_0b5e,
-	.act_pattern_id = 159,
+	.act_hid = BNXT_ULP_ACT_HID_27b62,
+	.act_pattern_id = 133,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_COUNT |
-		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[218] = {
-	.act_hid = BNXT_ULP_ACT_HID_651a,
-	.act_pattern_id = 160,
+	.act_hid = BNXT_ULP_ACT_HID_3602,
+	.act_pattern_id = 134,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[219] = {
-	.act_hid = BNXT_ULP_ACT_HID_4f7e,
-	.act_pattern_id = 161,
+	.act_hid = BNXT_ULP_ACT_HID_3b0c2,
+	.act_pattern_id = 135,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
-		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[220] = {
-	.act_hid = BNXT_ULP_ACT_HID_06d2,
-	.act_pattern_id = 162,
+	.act_hid = BNXT_ULP_ACT_HID_be82,
+	.act_pattern_id = 136,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_ACT_BIT_SET_TP_DST |
@@ -3134,96 +3270,91 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 3
 	},
 	[221] = {
-	.act_hid = BNXT_ULP_ACT_HID_762a,
-	.act_pattern_id = 163,
+	.act_hid = BNXT_ULP_ACT_HID_2dfc2,
+	.act_pattern_id = 137,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[222] = {
-	.act_hid = BNXT_ULP_ACT_HID_17e2,
-	.act_pattern_id = 164,
+	.act_hid = BNXT_ULP_ACT_HID_9a62,
+	.act_pattern_id = 138,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
-		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[223] = {
-	.act_hid = BNXT_ULP_ACT_HID_5c0a,
-	.act_pattern_id = 165,
+	.act_hid = BNXT_ULP_ACT_HID_36842,
+	.act_pattern_id = 139,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_COUNT |
-		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[224] = {
-	.act_hid = BNXT_ULP_ACT_HID_135e,
-	.act_pattern_id = 166,
+	.act_hid = BNXT_ULP_ACT_HID_2bb62,
+	.act_pattern_id = 140,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_COUNT |
-		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[225] = {
-	.act_hid = BNXT_ULP_ACT_HID_6d1a,
-	.act_pattern_id = 167,
+	.act_hid = BNXT_ULP_ACT_HID_7602,
+	.act_pattern_id = 141,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[226] = {
-	.act_hid = BNXT_ULP_ACT_HID_577e,
-	.act_pattern_id = 168,
+	.act_hid = BNXT_ULP_ACT_HID_12e2,
+	.act_pattern_id = 142,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
-		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[227] = {
-	.act_hid = BNXT_ULP_ACT_HID_0ed2,
-	.act_pattern_id = 169,
+	.act_hid = BNXT_ULP_ACT_HID_fe82,
+	.act_pattern_id = 143,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_ACT_BIT_SET_TP_DST |
@@ -3231,88 +3362,84 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 3
 	},
 	[228] = {
-	.act_hid = BNXT_ULP_ACT_HID_026e,
-	.act_pattern_id = 170,
+	.act_hid = BNXT_ULP_ACT_HID_22042,
+	.act_pattern_id = 144,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[229] = {
-	.act_hid = BNXT_ULP_ACT_HID_1fe2,
-	.act_pattern_id = 171,
+	.act_hid = BNXT_ULP_ACT_HID_3b8c2,
+	.act_pattern_id = 145,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
-		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[230] = {
-	.act_hid = BNXT_ULP_ACT_HID_5d82,
-	.act_pattern_id = 172,
+	.act_hid = BNXT_ULP_ACT_HID_2a8c2,
+	.act_pattern_id = 146,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_DEC_TTL |
-		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[231] = {
-	.act_hid = BNXT_ULP_ACT_HID_14d6,
-	.act_pattern_id = 173,
+	.act_hid = BNXT_ULP_ACT_HID_1fbe2,
+	.act_pattern_id = 147,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_DEC_TTL |
-		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[232] = {
-	.act_hid = BNXT_ULP_ACT_HID_6e92,
-	.act_pattern_id = 174,
+	.act_hid = BNXT_ULP_ACT_HID_39462,
+	.act_pattern_id = 148,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[233] = {
-	.act_hid = BNXT_ULP_ACT_HID_58f6,
-	.act_pattern_id = 175,
+	.act_hid = BNXT_ULP_ACT_HID_33142,
+	.act_pattern_id = 149,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
-		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[234] = {
-	.act_hid = BNXT_ULP_ACT_HID_104a,
-	.act_pattern_id = 176,
+	.act_hid = BNXT_ULP_ACT_HID_3f02,
+	.act_pattern_id = 150,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_ACT_BIT_SET_TP_DST |
@@ -3320,90 +3447,89 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 3
 	},
 	[235] = {
-	.act_hid = BNXT_ULP_ACT_HID_215a,
-	.act_pattern_id = 177,
+	.act_hid = BNXT_ULP_ACT_HID_26042,
+	.act_pattern_id = 151,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
-		BNXT_ULP_ACT_BIT_SET_TP_SRC |
-		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[236] = {
-	.act_hid = BNXT_ULP_ACT_HID_5d92,
-	.act_pattern_id = 178,
+	.act_hid = BNXT_ULP_ACT_HID_1ae2,
+	.act_pattern_id = 152,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[237] = {
-	.act_hid = BNXT_ULP_ACT_HID_14e6,
-	.act_pattern_id = 179,
+	.act_hid = BNXT_ULP_ACT_HID_2e8c2,
+	.act_pattern_id = 153,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_COUNT |
-		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[238] = {
-	.act_hid = BNXT_ULP_ACT_HID_6ea2,
-	.act_pattern_id = 180,
+	.act_hid = BNXT_ULP_ACT_HID_23be2,
+	.act_pattern_id = 154,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[239] = {
-	.act_hid = BNXT_ULP_ACT_HID_5906,
-	.act_pattern_id = 181,
+	.act_hid = BNXT_ULP_ACT_HID_3d462,
+	.act_pattern_id = 155,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[240] = {
-	.act_hid = BNXT_ULP_ACT_HID_105a,
-	.act_pattern_id = 182,
+	.act_hid = BNXT_ULP_ACT_HID_37142,
+	.act_pattern_id = 156,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
-		BNXT_ULP_ACT_BIT_SET_TP_SRC |
-		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[241] = {
-	.act_hid = BNXT_ULP_ACT_HID_216a,
-	.act_pattern_id = 183,
+	.act_hid = BNXT_ULP_ACT_HID_7f02,
+	.act_pattern_id = 157,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
@@ -3413,63 +3539,63 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 3
 	},
 	[242] = {
-	.act_hid = BNXT_ULP_ACT_HID_6582,
-	.act_pattern_id = 184,
+	.act_hid = BNXT_ULP_ACT_HID_2a042,
+	.act_pattern_id = 158,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[243] = {
-	.act_hid = BNXT_ULP_ACT_HID_1cd6,
-	.act_pattern_id = 185,
+	.act_hid = BNXT_ULP_ACT_HID_5ae2,
+	.act_pattern_id = 159,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[244] = {
-	.act_hid = BNXT_ULP_ACT_HID_7692,
-	.act_pattern_id = 186,
+	.act_hid = BNXT_ULP_ACT_HID_328c2,
+	.act_pattern_id = 160,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[245] = {
-	.act_hid = BNXT_ULP_ACT_HID_60f6,
-	.act_pattern_id = 187,
+	.act_hid = BNXT_ULP_ACT_HID_27be2,
+	.act_pattern_id = 161,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[246] = {
-	.act_hid = BNXT_ULP_ACT_HID_184a,
-	.act_pattern_id = 188,
+	.act_hid = BNXT_ULP_ACT_HID_3682,
+	.act_pattern_id = 162,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_ACT_BIT_SET_TP_DST |
@@ -3477,99 +3603,96 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 3
 	},
 	[247] = {
-	.act_hid = BNXT_ULP_ACT_HID_295a,
-	.act_pattern_id = 189,
+	.act_hid = BNXT_ULP_ACT_HID_3b142,
+	.act_pattern_id = 163,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
-		BNXT_ULP_ACT_BIT_SET_TP_SRC |
-		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[248] = {
-	.act_hid = BNXT_ULP_ACT_HID_6592,
-	.act_pattern_id = 190,
+	.act_hid = BNXT_ULP_ACT_HID_bf02,
+	.act_pattern_id = 164,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[249] = {
-	.act_hid = BNXT_ULP_ACT_HID_1ce6,
-	.act_pattern_id = 191,
+	.act_hid = BNXT_ULP_ACT_HID_2e042,
+	.act_pattern_id = 165,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
-		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[250] = {
-	.act_hid = BNXT_ULP_ACT_HID_76a2,
-	.act_pattern_id = 192,
+	.act_hid = BNXT_ULP_ACT_HID_9ae2,
+	.act_pattern_id = 166,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_COUNT |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[251] = {
-	.act_hid = BNXT_ULP_ACT_HID_6106,
-	.act_pattern_id = 193,
+	.act_hid = BNXT_ULP_ACT_HID_368c2,
+	.act_pattern_id = 167,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
-		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[252] = {
-	.act_hid = BNXT_ULP_ACT_HID_185a,
-	.act_pattern_id = 194,
+	.act_hid = BNXT_ULP_ACT_HID_2bbe2,
+	.act_pattern_id = 168,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
-		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[253] = {
-	.act_hid = BNXT_ULP_ACT_HID_296a,
-	.act_pattern_id = 195,
+	.act_hid = BNXT_ULP_ACT_HID_7682,
+	.act_pattern_id = 169,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_COUNT |
-		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_ACT_BIT_SET_TP_DST |
@@ -3577,62 +3700,87 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 3
 	},
 	[254] = {
-	.act_hid = BNXT_ULP_ACT_HID_6d82,
-	.act_pattern_id = 196,
+	.act_hid = BNXT_ULP_ACT_HID_1362,
+	.act_pattern_id = 170,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[255] = {
-	.act_hid = BNXT_ULP_ACT_HID_24d6,
-	.act_pattern_id = 197,
+	.act_hid = BNXT_ULP_ACT_HID_ff02,
+	.act_pattern_id = 171,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
-		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[256] = {
-	.act_hid = BNXT_ULP_ACT_HID_02d6,
-	.act_pattern_id = 198,
+	.act_hid = BNXT_ULP_ACT_HID_2ec02,
+	.act_pattern_id = 172,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
-		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
 	[257] = {
-	.act_hid = BNXT_ULP_ACT_HID_68f6,
-	.act_pattern_id = 199,
+	.act_hid = BNXT_ULP_ACT_HID_a6a2,
+	.act_pattern_id = 173,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 3
+	},
+	[258] = {
+	.act_hid = BNXT_ULP_ACT_HID_37482,
+	.act_pattern_id = 174,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 3
+	},
+	[259] = {
+	.act_hid = BNXT_ULP_ACT_HID_2c7a2,
+	.act_pattern_id = 175,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
-	[258] = {
-	.act_hid = BNXT_ULP_ACT_HID_204a,
-	.act_pattern_id = 200,
+	[260] = {
+	.act_hid = BNXT_ULP_ACT_HID_8242,
+	.act_pattern_id = 176,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
@@ -3640,13 +3788,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
-	[259] = {
-	.act_hid = BNXT_ULP_ACT_HID_315a,
-	.act_pattern_id = 201,
+	[261] = {
+	.act_hid = BNXT_ULP_ACT_HID_10ac2,
+	.act_pattern_id = 177,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
@@ -3655,26 +3802,24 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
-	[260] = {
-	.act_hid = BNXT_ULP_ACT_HID_6d92,
-	.act_pattern_id = 202,
+	[262] = {
+	.act_hid = BNXT_ULP_ACT_HID_2ec82,
+	.act_pattern_id = 178,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
-	[261] = {
-	.act_hid = BNXT_ULP_ACT_HID_24e6,
-	.act_pattern_id = 203,
+	[263] = {
+	.act_hid = BNXT_ULP_ACT_HID_a722,
+	.act_pattern_id = 179,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
@@ -3682,26 +3827,24 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
-	[262] = {
-	.act_hid = BNXT_ULP_ACT_HID_02e6,
-	.act_pattern_id = 204,
+	[264] = {
+	.act_hid = BNXT_ULP_ACT_HID_37502,
+	.act_pattern_id = 180,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
-	[263] = {
-	.act_hid = BNXT_ULP_ACT_HID_6906,
-	.act_pattern_id = 205,
+	[265] = {
+	.act_hid = BNXT_ULP_ACT_HID_2c822,
+	.act_pattern_id = 181,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
@@ -3709,13 +3852,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
-	[264] = {
-	.act_hid = BNXT_ULP_ACT_HID_205a,
-	.act_pattern_id = 206,
+	[266] = {
+	.act_hid = BNXT_ULP_ACT_HID_82c2,
+	.act_pattern_id = 182,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
@@ -3724,13 +3866,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
-	[265] = {
-	.act_hid = BNXT_ULP_ACT_HID_316a,
-	.act_pattern_id = 207,
+	[267] = {
+	.act_hid = BNXT_ULP_ACT_HID_10b42,
+	.act_pattern_id = 183,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
@@ -3740,68 +3881,63 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
-	[266] = {
-	.act_hid = BNXT_ULP_ACT_HID_7582,
-	.act_pattern_id = 208,
+	[268] = {
+	.act_hid = BNXT_ULP_ACT_HID_32c02,
+	.act_pattern_id = 184,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
-	[267] = {
-	.act_hid = BNXT_ULP_ACT_HID_2cd6,
-	.act_pattern_id = 209,
+	[269] = {
+	.act_hid = BNXT_ULP_ACT_HID_e6a2,
+	.act_pattern_id = 185,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
-	[268] = {
-	.act_hid = BNXT_ULP_ACT_HID_0ad6,
-	.act_pattern_id = 210,
+	[270] = {
+	.act_hid = BNXT_ULP_ACT_HID_3b482,
+	.act_pattern_id = 186,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
-	[269] = {
-	.act_hid = BNXT_ULP_ACT_HID_70f6,
-	.act_pattern_id = 211,
+	[271] = {
+	.act_hid = BNXT_ULP_ACT_HID_307a2,
+	.act_pattern_id = 187,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
-	[270] = {
-	.act_hid = BNXT_ULP_ACT_HID_284a,
-	.act_pattern_id = 212,
+	[272] = {
+	.act_hid = BNXT_ULP_ACT_HID_c242,
+	.act_pattern_id = 188,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
@@ -3809,14 +3945,13 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
-	[271] = {
-	.act_hid = BNXT_ULP_ACT_HID_395a,
-	.act_pattern_id = 213,
+	[273] = {
+	.act_hid = BNXT_ULP_ACT_HID_14ac2,
+	.act_pattern_id = 189,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
@@ -3825,28 +3960,26 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
-	[272] = {
-	.act_hid = BNXT_ULP_ACT_HID_7592,
-	.act_pattern_id = 214,
+	[274] = {
+	.act_hid = BNXT_ULP_ACT_HID_32c82,
+	.act_pattern_id = 190,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
-	[273] = {
-	.act_hid = BNXT_ULP_ACT_HID_2ce6,
-	.act_pattern_id = 215,
+	[275] = {
+	.act_hid = BNXT_ULP_ACT_HID_e722,
+	.act_pattern_id = 191,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
@@ -3854,28 +3987,26 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
-	[274] = {
-	.act_hid = BNXT_ULP_ACT_HID_0ae6,
-	.act_pattern_id = 216,
+	[276] = {
+	.act_hid = BNXT_ULP_ACT_HID_3b502,
+	.act_pattern_id = 192,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
-	[275] = {
-	.act_hid = BNXT_ULP_ACT_HID_7106,
-	.act_pattern_id = 217,
+	[277] = {
+	.act_hid = BNXT_ULP_ACT_HID_30822,
+	.act_pattern_id = 193,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
@@ -3883,14 +4014,13 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
-	[276] = {
-	.act_hid = BNXT_ULP_ACT_HID_285a,
-	.act_pattern_id = 218,
+	[278] = {
+	.act_hid = BNXT_ULP_ACT_HID_c2c2,
+	.act_pattern_id = 194,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
@@ -3899,14 +4029,13 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
-	[277] = {
-	.act_hid = BNXT_ULP_ACT_HID_396a,
-	.act_pattern_id = 219,
+	[279] = {
+	.act_hid = BNXT_ULP_ACT_HID_14b42,
+	.act_pattern_id = 195,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
-		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
@@ -3916,555 +4045,2610 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.act_tid = 3
 	},
-	[278] = {
-	.act_hid = BNXT_ULP_ACT_HID_0020,
-	.act_pattern_id = 0,
-	.app_sig = 0,
-	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_RSS |
-		BNXT_ULP_FLOW_DIR_BITMASK_ING },
-	.act_tid = 4
-	},
-	[279] = {
-	.act_hid = BNXT_ULP_ACT_HID_0030,
-	.act_pattern_id = 1,
-	.app_sig = 0,
-	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_RSS |
-		BNXT_ULP_ACT_BIT_COUNT |
-		BNXT_ULP_FLOW_DIR_BITMASK_ING },
-	.act_tid = 4
-	},
 	[280] = {
-	.act_hid = BNXT_ULP_ACT_HID_65d4,
-	.act_pattern_id = 2,
+	.act_hid = BNXT_ULP_ACT_HID_36c02,
+	.act_pattern_id = 196,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_QUEUE |
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
-	.act_tid = 4
+	.act_tid = 3
 	},
 	[281] = {
-	.act_hid = BNXT_ULP_ACT_HID_65e4,
-	.act_pattern_id = 3,
+	.act_hid = BNXT_ULP_ACT_HID_126a2,
+	.act_pattern_id = 197,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_QUEUE |
-		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
-	.act_tid = 4
+	.act_tid = 3
 	},
 	[282] = {
-	.act_hid = BNXT_ULP_ACT_HID_330a,
-	.act_pattern_id = 4,
+	.act_hid = BNXT_ULP_ACT_HID_16a2,
+	.act_pattern_id = 198,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_RSS |
-		BNXT_ULP_FLOW_DIR_BITMASK_ING },
-	.act_tid = 4
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 3
 	},
 	[283] = {
-	.act_hid = BNXT_ULP_ACT_HID_331a,
-	.act_pattern_id = 5,
+	.act_hid = BNXT_ULP_ACT_HID_347a2,
+	.act_pattern_id = 199,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_RSS |
-		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
-	.act_tid = 4
+	.act_tid = 3
 	},
 	[284] = {
-	.act_hid = BNXT_ULP_ACT_HID_1cfe,
-	.act_pattern_id = 6,
+	.act_hid = BNXT_ULP_ACT_HID_10242,
+	.act_pattern_id = 200,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_QUEUE |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
-	.act_tid = 4
+	.act_tid = 3
 	},
 	[285] = {
-	.act_hid = BNXT_ULP_ACT_HID_1d0e,
-	.act_pattern_id = 7,
+	.act_hid = BNXT_ULP_ACT_HID_18ac2,
+	.act_pattern_id = 201,
 	.app_sig = 0,
 	.act_sig = { .bits =
 		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_QUEUE |
-		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
-	.act_tid = 4
+	.act_tid = 3
 	},
 	[286] = {
-	.act_hid = BNXT_ULP_ACT_HID_1474,
-	.act_pattern_id = 0,
+	.act_hid = BNXT_ULP_ACT_HID_36c82,
+	.act_pattern_id = 202,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_METER_PROFILE |
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
-	.act_tid = 5
+	.act_tid = 3
 	},
 	[287] = {
-	.act_hid = BNXT_ULP_ACT_HID_4838,
-	.act_pattern_id = 1,
+	.act_hid = BNXT_ULP_ACT_HID_12722,
+	.act_pattern_id = 203,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_METER |
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
-	.act_tid = 5
+	.act_tid = 3
 	},
 	[288] = {
-	.act_hid = BNXT_ULP_ACT_HID_6458,
-	.act_pattern_id = 2,
+	.act_hid = BNXT_ULP_ACT_HID_1722,
+	.act_pattern_id = 204,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_DELETE |
-		BNXT_ULP_ACT_BIT_METER_PROFILE |
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
-	.act_tid = 5
+	.act_tid = 3
 	},
 	[289] = {
-	.act_hid = BNXT_ULP_ACT_HID_1c68,
-	.act_pattern_id = 3,
+	.act_hid = BNXT_ULP_ACT_HID_34822,
+	.act_pattern_id = 205,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_DELETE |
-		BNXT_ULP_ACT_BIT_SHARED_METER |
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
-	.act_tid = 5
+	.act_tid = 3
 	},
 	[290] = {
-	.act_hid = BNXT_ULP_ACT_HID_6c34,
-	.act_pattern_id = 4,
+	.act_hid = BNXT_ULP_ACT_HID_102c2,
+	.act_pattern_id = 206,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_UPDATE |
-		BNXT_ULP_ACT_BIT_SHARED_METER |
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
-	.act_tid = 5
+	.act_tid = 3
 	},
 	[291] = {
-	.act_hid = BNXT_ULP_ACT_HID_5d08,
-	.act_pattern_id = 0,
+	.act_hid = BNXT_ULP_ACT_HID_18b42,
+	.act_pattern_id = 207,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
-	.act_tid = 6
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 3
 	},
 	[292] = {
-	.act_hid = BNXT_ULP_ACT_HID_5d10,
-	.act_pattern_id = 1,
+	.act_hid = BNXT_ULP_ACT_HID_3ac02,
+	.act_pattern_id = 208,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_DROP |
-		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
-	.act_tid = 6
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 3
 	},
 	[293] = {
-	.act_hid = BNXT_ULP_ACT_HID_5d20,
-	.act_pattern_id = 2,
+	.act_hid = BNXT_ULP_ACT_HID_166a2,
+	.act_pattern_id = 209,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_DROP |
-		BNXT_ULP_ACT_BIT_COUNT |
-		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
-	.act_tid = 6
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 3
 	},
 	[294] = {
-	.act_hid = BNXT_ULP_ACT_HID_2e18,
-	.act_pattern_id = 3,
+	.act_hid = BNXT_ULP_ACT_HID_56a2,
+	.act_pattern_id = 210,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_VLAN_PCP |
-		BNXT_ULP_ACT_BIT_SET_VLAN_VID |
-		BNXT_ULP_ACT_BIT_PUSH_VLAN |
-		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
-	.act_tid = 6
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 3
 	},
 	[295] = {
-	.act_hid = BNXT_ULP_ACT_HID_29d4,
-	.act_pattern_id = 4,
+	.act_hid = BNXT_ULP_ACT_HID_387a2,
+	.act_pattern_id = 211,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SET_VLAN_VID |
-		BNXT_ULP_ACT_BIT_PUSH_VLAN |
-		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
-	.act_tid = 6
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 3
 	},
 	[296] = {
-	.act_hid = BNXT_ULP_ACT_HID_7690,
-	.act_pattern_id = 5,
+	.act_hid = BNXT_ULP_ACT_HID_14242,
+	.act_pattern_id = 212,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
-		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
-	.act_tid = 6
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 3
 	},
 	[297] = {
-	.act_hid = BNXT_ULP_ACT_HID_47a0,
-	.act_pattern_id = 6,
+	.act_hid = BNXT_ULP_ACT_HID_1cac2,
+	.act_pattern_id = 213,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
-		BNXT_ULP_ACT_BIT_SET_VLAN_PCP |
-		BNXT_ULP_ACT_BIT_SET_VLAN_VID |
-		BNXT_ULP_ACT_BIT_PUSH_VLAN |
-		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
-	.act_tid = 6
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 3
 	},
 	[298] = {
-	.act_hid = BNXT_ULP_ACT_HID_435c,
-	.act_pattern_id = 7,
+	.act_hid = BNXT_ULP_ACT_HID_3ac82,
+	.act_pattern_id = 214,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
-		BNXT_ULP_ACT_BIT_SET_VLAN_VID |
-		BNXT_ULP_ACT_BIT_PUSH_VLAN |
-		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
-	.act_tid = 6
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 3
 	},
 	[299] = {
-	.act_hid = BNXT_ULP_ACT_HID_5d18,
-	.act_pattern_id = 8,
+	.act_hid = BNXT_ULP_ACT_HID_16722,
+	.act_pattern_id = 215,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
-		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
-	.act_tid = 6
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 3
 	},
 	[300] = {
-	.act_hid = BNXT_ULP_ACT_HID_2e28,
-	.act_pattern_id = 9,
+	.act_hid = BNXT_ULP_ACT_HID_5722,
+	.act_pattern_id = 216,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
-		BNXT_ULP_ACT_BIT_SET_VLAN_PCP |
-		BNXT_ULP_ACT_BIT_SET_VLAN_VID |
-		BNXT_ULP_ACT_BIT_PUSH_VLAN |
-		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
-	.act_tid = 6
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 3
 	},
 	[301] = {
-	.act_hid = BNXT_ULP_ACT_HID_29e4,
-	.act_pattern_id = 10,
+	.act_hid = BNXT_ULP_ACT_HID_38822,
+	.act_pattern_id = 217,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
-		BNXT_ULP_ACT_BIT_SET_VLAN_VID |
-		BNXT_ULP_ACT_BIT_PUSH_VLAN |
-		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
-	.act_tid = 6
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 3
 	},
 	[302] = {
-	.act_hid = BNXT_ULP_ACT_HID_76a0,
-	.act_pattern_id = 11,
+	.act_hid = BNXT_ULP_ACT_HID_142c2,
+	.act_pattern_id = 218,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
-		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
-	.act_tid = 6
-	},
-	[303] = {
-	.act_hid = BNXT_ULP_ACT_HID_47b0,
-	.act_pattern_id = 12,
-	.app_sig = 0,
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 3
+	},
+	[303] = {
+	.act_hid = BNXT_ULP_ACT_HID_1cb42,
+	.act_pattern_id = 219,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 3
+	},
+	[304] = {
+	.act_hid = BNXT_ULP_ACT_HID_12520,
+	.act_pattern_id = 220,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 3
+	},
+	[305] = {
+	.act_hid = BNXT_ULP_ACT_HID_2bda0,
+	.act_pattern_id = 221,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 3
+	},
+	[306] = {
+	.act_hid = BNXT_ULP_ACT_HID_1ada0,
+	.act_pattern_id = 222,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 3
+	},
+	[307] = {
+	.act_hid = BNXT_ULP_ACT_HID_120c0,
+	.act_pattern_id = 223,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 3
+	},
+	[308] = {
+	.act_hid = BNXT_ULP_ACT_HID_2b940,
+	.act_pattern_id = 224,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 3
+	},
+	[309] = {
+	.act_hid = BNXT_ULP_ACT_HID_23620,
+	.act_pattern_id = 225,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 3
+	},
+	[310] = {
+	.act_hid = BNXT_ULP_ACT_HID_321c0,
+	.act_pattern_id = 226,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 3
+	},
+	[311] = {
+	.act_hid = BNXT_ULP_ACT_HID_125a0,
+	.act_pattern_id = 227,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 3
+	},
+	[312] = {
+	.act_hid = BNXT_ULP_ACT_HID_2be20,
+	.act_pattern_id = 228,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 3
+	},
+	[313] = {
+	.act_hid = BNXT_ULP_ACT_HID_1ae20,
+	.act_pattern_id = 229,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 3
+	},
+	[314] = {
+	.act_hid = BNXT_ULP_ACT_HID_12140,
+	.act_pattern_id = 230,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 3
+	},
+	[315] = {
+	.act_hid = BNXT_ULP_ACT_HID_2b9c0,
+	.act_pattern_id = 231,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 3
+	},
+	[316] = {
+	.act_hid = BNXT_ULP_ACT_HID_236a0,
+	.act_pattern_id = 232,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 3
+	},
+	[317] = {
+	.act_hid = BNXT_ULP_ACT_HID_32240,
+	.act_pattern_id = 233,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 3
+	},
+	[318] = {
+	.act_hid = BNXT_ULP_ACT_HID_1f160,
+	.act_pattern_id = 234,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 3
+	},
+	[319] = {
+	.act_hid = BNXT_ULP_ACT_HID_3a9e0,
+	.act_pattern_id = 235,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 3
+	},
+	[320] = {
+	.act_hid = BNXT_ULP_ACT_HID_279e0,
+	.act_pattern_id = 236,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 3
+	},
+	[321] = {
+	.act_hid = BNXT_ULP_ACT_HID_1ed00,
+	.act_pattern_id = 237,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 3
+	},
+	[322] = {
+	.act_hid = BNXT_ULP_ACT_HID_36580,
+	.act_pattern_id = 238,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 3
+	},
+	[323] = {
+	.act_hid = BNXT_ULP_ACT_HID_3020,
+	.act_pattern_id = 239,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 3
+	},
+	[324] = {
+	.act_hid = BNXT_ULP_ACT_HID_1f1e0,
+	.act_pattern_id = 240,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 3
+	},
+	[325] = {
+	.act_hid = BNXT_ULP_ACT_HID_3aa60,
+	.act_pattern_id = 241,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 3
+	},
+	[326] = {
+	.act_hid = BNXT_ULP_ACT_HID_27a60,
+	.act_pattern_id = 242,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 3
+	},
+	[327] = {
+	.act_hid = BNXT_ULP_ACT_HID_1ed80,
+	.act_pattern_id = 243,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 3
+	},
+	[328] = {
+	.act_hid = BNXT_ULP_ACT_HID_36600,
+	.act_pattern_id = 244,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 3
+	},
+	[329] = {
+	.act_hid = BNXT_ULP_ACT_HID_30a0,
+	.act_pattern_id = 245,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 3
+	},
+	[330] = {
+	.act_hid = BNXT_ULP_ACT_HID_0100,
+	.act_pattern_id = 0,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_RSS |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 4
+	},
+	[331] = {
+	.act_hid = BNXT_ULP_ACT_HID_0180,
+	.act_pattern_id = 1,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_RSS |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 4
+	},
+	[332] = {
+	.act_hid = BNXT_ULP_ACT_HID_32e84,
+	.act_pattern_id = 2,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_QUEUE |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 4
+	},
+	[333] = {
+	.act_hid = BNXT_ULP_ACT_HID_32f04,
+	.act_pattern_id = 3,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_QUEUE |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 4
+	},
+	[334] = {
+	.act_hid = BNXT_ULP_ACT_HID_19842,
+	.act_pattern_id = 4,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_RSS |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 4
+	},
+	[335] = {
+	.act_hid = BNXT_ULP_ACT_HID_198c2,
+	.act_pattern_id = 5,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_RSS |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 4
+	},
+	[336] = {
+	.act_hid = BNXT_ULP_ACT_HID_e7e6,
+	.act_pattern_id = 6,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_QUEUE |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 4
+	},
+	[337] = {
+	.act_hid = BNXT_ULP_ACT_HID_e866,
+	.act_pattern_id = 7,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_QUEUE |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 4
+	},
+	[338] = {
+	.act_hid = BNXT_ULP_ACT_HID_a3e0,
+	.act_pattern_id = 0,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_METER_PROFILE |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 5
+	},
+	[339] = {
+	.act_hid = BNXT_ULP_ACT_HID_240e0,
+	.act_pattern_id = 1,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_METER |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 5
+	},
+	[340] = {
+	.act_hid = BNXT_ULP_ACT_HID_322c8,
+	.act_pattern_id = 2,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_DELETE |
+		BNXT_ULP_ACT_BIT_METER_PROFILE |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 5
+	},
+	[341] = {
+	.act_hid = BNXT_ULP_ACT_HID_e228,
+	.act_pattern_id = 3,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_DELETE |
+		BNXT_ULP_ACT_BIT_SHARED_METER |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 5
+	},
+	[342] = {
+	.act_hid = BNXT_ULP_ACT_HID_36130,
+	.act_pattern_id = 4,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_UPDATE |
+		BNXT_ULP_ACT_BIT_SHARED_METER |
+		BNXT_ULP_FLOW_DIR_BITMASK_ING },
+	.act_tid = 5
+	},
+	[343] = {
+	.act_hid = BNXT_ULP_ACT_HID_2e840,
+	.act_pattern_id = 0,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 6
+	},
+	[344] = {
+	.act_hid = BNXT_ULP_ACT_HID_2e880,
+	.act_pattern_id = 1,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_DROP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 6
+	},
+	[345] = {
+	.act_hid = BNXT_ULP_ACT_HID_2e900,
+	.act_pattern_id = 2,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_DROP |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 6
+	},
+	[346] = {
+	.act_hid = BNXT_ULP_ACT_HID_170c0,
+	.act_pattern_id = 3,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_VLAN_PCP |
+		BNXT_ULP_ACT_BIT_SET_VLAN_VID |
+		BNXT_ULP_ACT_BIT_PUSH_VLAN |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 6
+	},
+	[347] = {
+	.act_hid = BNXT_ULP_ACT_HID_14ea0,
+	.act_pattern_id = 4,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_VLAN_VID |
+		BNXT_ULP_ACT_BIT_PUSH_VLAN |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 6
+	},
+	[348] = {
+	.act_hid = BNXT_ULP_ACT_HID_3b480,
+	.act_pattern_id = 5,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 6
+	},
+	[349] = {
+	.act_hid = BNXT_ULP_ACT_HID_23d00,
+	.act_pattern_id = 6,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_VLAN_PCP |
+		BNXT_ULP_ACT_BIT_SET_VLAN_VID |
+		BNXT_ULP_ACT_BIT_PUSH_VLAN |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 6
+	},
+	[350] = {
+	.act_hid = BNXT_ULP_ACT_HID_21ae0,
+	.act_pattern_id = 7,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_VLAN_VID |
+		BNXT_ULP_ACT_BIT_PUSH_VLAN |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 6
+	},
+	[351] = {
+	.act_hid = BNXT_ULP_ACT_HID_2e8c0,
+	.act_pattern_id = 8,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 6
+	},
+	[352] = {
+	.act_hid = BNXT_ULP_ACT_HID_17140,
+	.act_pattern_id = 9,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_VLAN_PCP |
+		BNXT_ULP_ACT_BIT_SET_VLAN_VID |
+		BNXT_ULP_ACT_BIT_PUSH_VLAN |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 6
+	},
+	[353] = {
+	.act_hid = BNXT_ULP_ACT_HID_14f20,
+	.act_pattern_id = 10,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_VLAN_VID |
+		BNXT_ULP_ACT_BIT_PUSH_VLAN |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 6
+	},
+	[354] = {
+	.act_hid = BNXT_ULP_ACT_HID_3b500,
+	.act_pattern_id = 11,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 6
+	},
+	[355] = {
+	.act_hid = BNXT_ULP_ACT_HID_23d80,
+	.act_pattern_id = 12,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_VLAN_PCP |
+		BNXT_ULP_ACT_BIT_SET_VLAN_VID |
+		BNXT_ULP_ACT_BIT_PUSH_VLAN |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 6
+	},
+	[356] = {
+	.act_hid = BNXT_ULP_ACT_HID_21b60,
+	.act_pattern_id = 13,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_VLAN_VID |
+		BNXT_ULP_ACT_BIT_PUSH_VLAN |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 6
+	},
+	[357] = {
+	.act_hid = BNXT_ULP_ACT_HID_a1a2,
+	.act_pattern_id = 14,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 6
+	},
+	[358] = {
+	.act_hid = BNXT_ULP_ACT_HID_a1e2,
+	.act_pattern_id = 15,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_DROP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 6
+	},
+	[359] = {
+	.act_hid = BNXT_ULP_ACT_HID_a262,
+	.act_pattern_id = 16,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_DROP |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 6
+	},
+	[360] = {
+	.act_hid = BNXT_ULP_ACT_HID_30802,
+	.act_pattern_id = 17,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_VLAN_PCP |
+		BNXT_ULP_ACT_BIT_SET_VLAN_VID |
+		BNXT_ULP_ACT_BIT_PUSH_VLAN |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 6
+	},
+	[361] = {
+	.act_hid = BNXT_ULP_ACT_HID_2e5e2,
+	.act_pattern_id = 18,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_VLAN_VID |
+		BNXT_ULP_ACT_BIT_PUSH_VLAN |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 6
+	},
+	[362] = {
+	.act_hid = BNXT_ULP_ACT_HID_16de2,
+	.act_pattern_id = 19,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 6
+	},
+	[363] = {
+	.act_hid = BNXT_ULP_ACT_HID_3d442,
+	.act_pattern_id = 20,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_VLAN_PCP |
+		BNXT_ULP_ACT_BIT_SET_VLAN_VID |
+		BNXT_ULP_ACT_BIT_PUSH_VLAN |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 6
+	},
+	[364] = {
+	.act_hid = BNXT_ULP_ACT_HID_3b222,
+	.act_pattern_id = 21,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_VLAN_VID |
+		BNXT_ULP_ACT_BIT_PUSH_VLAN |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 6
+	},
+	[365] = {
+	.act_hid = BNXT_ULP_ACT_HID_a222,
+	.act_pattern_id = 22,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 6
+	},
+	[366] = {
+	.act_hid = BNXT_ULP_ACT_HID_30882,
+	.act_pattern_id = 23,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_VLAN_PCP |
+		BNXT_ULP_ACT_BIT_SET_VLAN_VID |
+		BNXT_ULP_ACT_BIT_PUSH_VLAN |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 6
+	},
+	[367] = {
+	.act_hid = BNXT_ULP_ACT_HID_2e662,
+	.act_pattern_id = 24,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_VLAN_VID |
+		BNXT_ULP_ACT_BIT_PUSH_VLAN |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 6
+	},
+	[368] = {
+	.act_hid = BNXT_ULP_ACT_HID_16e62,
+	.act_pattern_id = 25,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 6
+	},
+	[369] = {
+	.act_hid = BNXT_ULP_ACT_HID_3d4c2,
+	.act_pattern_id = 26,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_VLAN_PCP |
+		BNXT_ULP_ACT_BIT_SET_VLAN_VID |
+		BNXT_ULP_ACT_BIT_PUSH_VLAN |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 6
+	},
+	[370] = {
+	.act_hid = BNXT_ULP_ACT_HID_3b2a2,
+	.act_pattern_id = 27,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_VLAN_VID |
+		BNXT_ULP_ACT_BIT_PUSH_VLAN |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 6
+	},
+	[371] = {
+	.act_hid = BNXT_ULP_ACT_HID_3a4e0,
+	.act_pattern_id = 28,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 6
+	},
+	[372] = {
+	.act_hid = BNXT_ULP_ACT_HID_3a520,
+	.act_pattern_id = 29,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_DROP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 6
+	},
+	[373] = {
+	.act_hid = BNXT_ULP_ACT_HID_3a5a0,
+	.act_pattern_id = 30,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_DROP |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 6
+	},
+	[374] = {
+	.act_hid = BNXT_ULP_ACT_HID_22d60,
+	.act_pattern_id = 31,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_SET_VLAN_PCP |
+		BNXT_ULP_ACT_BIT_SET_VLAN_VID |
+		BNXT_ULP_ACT_BIT_PUSH_VLAN |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 6
+	},
+	[375] = {
+	.act_hid = BNXT_ULP_ACT_HID_1eb40,
+	.act_pattern_id = 32,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_SET_VLAN_VID |
+		BNXT_ULP_ACT_BIT_PUSH_VLAN |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 6
+	},
+	[376] = {
+	.act_hid = BNXT_ULP_ACT_HID_7340,
+	.act_pattern_id = 33,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 6
+	},
+	[377] = {
+	.act_hid = BNXT_ULP_ACT_HID_2f9a0,
+	.act_pattern_id = 34,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_VLAN_PCP |
+		BNXT_ULP_ACT_BIT_SET_VLAN_VID |
+		BNXT_ULP_ACT_BIT_PUSH_VLAN |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 6
+	},
+	[378] = {
+	.act_hid = BNXT_ULP_ACT_HID_2b780,
+	.act_pattern_id = 35,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_VLAN_VID |
+		BNXT_ULP_ACT_BIT_PUSH_VLAN |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 6
+	},
+	[379] = {
+	.act_hid = BNXT_ULP_ACT_HID_3a560,
+	.act_pattern_id = 36,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 6
+	},
+	[380] = {
+	.act_hid = BNXT_ULP_ACT_HID_22de0,
+	.act_pattern_id = 37,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_VLAN_PCP |
+		BNXT_ULP_ACT_BIT_SET_VLAN_VID |
+		BNXT_ULP_ACT_BIT_PUSH_VLAN |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 6
+	},
+	[381] = {
+	.act_hid = BNXT_ULP_ACT_HID_1ebc0,
+	.act_pattern_id = 38,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_VLAN_VID |
+		BNXT_ULP_ACT_BIT_PUSH_VLAN |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 6
+	},
+	[382] = {
+	.act_hid = BNXT_ULP_ACT_HID_73c0,
+	.act_pattern_id = 39,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 6
+	},
+	[383] = {
+	.act_hid = BNXT_ULP_ACT_HID_2fa20,
+	.act_pattern_id = 40,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_VLAN_PCP |
+		BNXT_ULP_ACT_BIT_SET_VLAN_VID |
+		BNXT_ULP_ACT_BIT_PUSH_VLAN |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 6
+	},
+	[384] = {
+	.act_hid = BNXT_ULP_ACT_HID_2b800,
+	.act_pattern_id = 41,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_VLAN_VID |
+		BNXT_ULP_ACT_BIT_PUSH_VLAN |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 6
+	},
+	[385] = {
+	.act_hid = BNXT_ULP_ACT_HID_32840,
+	.act_pattern_id = 0,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[386] = {
+	.act_hid = BNXT_ULP_ACT_HID_36840,
+	.act_pattern_id = 1,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[387] = {
+	.act_hid = BNXT_ULP_ACT_HID_3a840,
+	.act_pattern_id = 2,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[388] = {
+	.act_hid = BNXT_ULP_ACT_HID_328c0,
+	.act_pattern_id = 3,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[389] = {
+	.act_hid = BNXT_ULP_ACT_HID_368c0,
+	.act_pattern_id = 4,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[390] = {
+	.act_hid = BNXT_ULP_ACT_HID_3a8c0,
+	.act_pattern_id = 5,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[391] = {
+	.act_hid = BNXT_ULP_ACT_HID_370c0,
+	.act_pattern_id = 6,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[392] = {
+	.act_hid = BNXT_ULP_ACT_HID_12b60,
+	.act_pattern_id = 7,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[393] = {
+	.act_hid = BNXT_ULP_ACT_HID_1b60,
+	.act_pattern_id = 8,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[394] = {
+	.act_hid = BNXT_ULP_ACT_HID_34c60,
+	.act_pattern_id = 9,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[395] = {
+	.act_hid = BNXT_ULP_ACT_HID_10700,
+	.act_pattern_id = 10,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[396] = {
+	.act_hid = BNXT_ULP_ACT_HID_18f80,
+	.act_pattern_id = 11,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[397] = {
+	.act_hid = BNXT_ULP_ACT_HID_3b0c0,
+	.act_pattern_id = 12,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[398] = {
+	.act_hid = BNXT_ULP_ACT_HID_16b60,
+	.act_pattern_id = 13,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[399] = {
+	.act_hid = BNXT_ULP_ACT_HID_5b60,
+	.act_pattern_id = 14,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[400] = {
+	.act_hid = BNXT_ULP_ACT_HID_38c60,
+	.act_pattern_id = 15,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[401] = {
+	.act_hid = BNXT_ULP_ACT_HID_14700,
+	.act_pattern_id = 16,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[402] = {
+	.act_hid = BNXT_ULP_ACT_HID_1cf80,
+	.act_pattern_id = 17,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[403] = {
+	.act_hid = BNXT_ULP_ACT_HID_12e0,
+	.act_pattern_id = 18,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[404] = {
+	.act_hid = BNXT_ULP_ACT_HID_1ab60,
+	.act_pattern_id = 19,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[405] = {
+	.act_hid = BNXT_ULP_ACT_HID_9b60,
+	.act_pattern_id = 20,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[406] = {
+	.act_hid = BNXT_ULP_ACT_HID_3cc60,
+	.act_pattern_id = 21,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[407] = {
+	.act_hid = BNXT_ULP_ACT_HID_18700,
+	.act_pattern_id = 22,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[408] = {
+	.act_hid = BNXT_ULP_ACT_HID_20f80,
+	.act_pattern_id = 23,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[409] = {
+	.act_hid = BNXT_ULP_ACT_HID_52e0,
+	.act_pattern_id = 24,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[410] = {
+	.act_hid = BNXT_ULP_ACT_HID_1eb60,
+	.act_pattern_id = 25,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[411] = {
+	.act_hid = BNXT_ULP_ACT_HID_db60,
+	.act_pattern_id = 26,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[412] = {
+	.act_hid = BNXT_ULP_ACT_HID_2e80,
+	.act_pattern_id = 27,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[413] = {
+	.act_hid = BNXT_ULP_ACT_HID_1c700,
+	.act_pattern_id = 28,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[414] = {
+	.act_hid = BNXT_ULP_ACT_HID_24f80,
+	.act_pattern_id = 29,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[415] = {
+	.act_hid = BNXT_ULP_ACT_HID_37140,
+	.act_pattern_id = 30,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[416] = {
+	.act_hid = BNXT_ULP_ACT_HID_12be0,
+	.act_pattern_id = 31,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[417] = {
+	.act_hid = BNXT_ULP_ACT_HID_1be0,
+	.act_pattern_id = 32,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[418] = {
+	.act_hid = BNXT_ULP_ACT_HID_34ce0,
+	.act_pattern_id = 33,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[419] = {
+	.act_hid = BNXT_ULP_ACT_HID_10780,
+	.act_pattern_id = 34,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[420] = {
+	.act_hid = BNXT_ULP_ACT_HID_19000,
+	.act_pattern_id = 35,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[421] = {
+	.act_hid = BNXT_ULP_ACT_HID_3b140,
+	.act_pattern_id = 36,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[422] = {
+	.act_hid = BNXT_ULP_ACT_HID_16be0,
+	.act_pattern_id = 37,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[423] = {
+	.act_hid = BNXT_ULP_ACT_HID_5be0,
+	.act_pattern_id = 38,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[424] = {
+	.act_hid = BNXT_ULP_ACT_HID_38ce0,
+	.act_pattern_id = 39,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[425] = {
+	.act_hid = BNXT_ULP_ACT_HID_14780,
+	.act_pattern_id = 40,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[426] = {
+	.act_hid = BNXT_ULP_ACT_HID_1d000,
+	.act_pattern_id = 41,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[427] = {
+	.act_hid = BNXT_ULP_ACT_HID_1360,
+	.act_pattern_id = 42,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[428] = {
+	.act_hid = BNXT_ULP_ACT_HID_1abe0,
+	.act_pattern_id = 43,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[429] = {
+	.act_hid = BNXT_ULP_ACT_HID_9be0,
+	.act_pattern_id = 44,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[430] = {
+	.act_hid = BNXT_ULP_ACT_HID_3cce0,
+	.act_pattern_id = 45,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[431] = {
+	.act_hid = BNXT_ULP_ACT_HID_18780,
+	.act_pattern_id = 46,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[432] = {
+	.act_hid = BNXT_ULP_ACT_HID_21000,
+	.act_pattern_id = 47,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[433] = {
+	.act_hid = BNXT_ULP_ACT_HID_5360,
+	.act_pattern_id = 48,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[434] = {
+	.act_hid = BNXT_ULP_ACT_HID_1ebe0,
+	.act_pattern_id = 49,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[435] = {
+	.act_hid = BNXT_ULP_ACT_HID_dbe0,
+	.act_pattern_id = 50,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[436] = {
+	.act_hid = BNXT_ULP_ACT_HID_2f00,
+	.act_pattern_id = 51,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[437] = {
+	.act_hid = BNXT_ULP_ACT_HID_1c780,
+	.act_pattern_id = 52,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[438] = {
+	.act_hid = BNXT_ULP_ACT_HID_25000,
+	.act_pattern_id = 53,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[439] = {
+	.act_hid = BNXT_ULP_ACT_HID_5f20,
+	.act_pattern_id = 54,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[440] = {
+	.act_hid = BNXT_ULP_ACT_HID_1f7a0,
+	.act_pattern_id = 55,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[441] = {
+	.act_hid = BNXT_ULP_ACT_HID_e7a0,
+	.act_pattern_id = 56,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[442] = {
+	.act_hid = BNXT_ULP_ACT_HID_3ac0,
+	.act_pattern_id = 57,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[443] = {
+	.act_hid = BNXT_ULP_ACT_HID_1d340,
+	.act_pattern_id = 58,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[444] = {
+	.act_hid = BNXT_ULP_ACT_HID_25bc0,
+	.act_pattern_id = 59,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[445] = {
+	.act_hid = BNXT_ULP_ACT_HID_5fa0,
+	.act_pattern_id = 60,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[446] = {
+	.act_hid = BNXT_ULP_ACT_HID_1f820,
+	.act_pattern_id = 61,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[447] = {
+	.act_hid = BNXT_ULP_ACT_HID_e820,
+	.act_pattern_id = 62,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[448] = {
+	.act_hid = BNXT_ULP_ACT_HID_3b40,
+	.act_pattern_id = 63,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[449] = {
+	.act_hid = BNXT_ULP_ACT_HID_1d3c0,
+	.act_pattern_id = 64,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[450] = {
+	.act_hid = BNXT_ULP_ACT_HID_25c40,
+	.act_pattern_id = 65,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[451] = {
+	.act_hid = BNXT_ULP_ACT_HID_237a0,
+	.act_pattern_id = 66,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[452] = {
+	.act_hid = BNXT_ULP_ACT_HID_127a0,
+	.act_pattern_id = 67,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[453] = {
+	.act_hid = BNXT_ULP_ACT_HID_7ac0,
+	.act_pattern_id = 68,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[454] = {
+	.act_hid = BNXT_ULP_ACT_HID_9f20,
+	.act_pattern_id = 69,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[455] = {
+	.act_hid = BNXT_ULP_ACT_HID_21340,
+	.act_pattern_id = 70,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[456] = {
+	.act_hid = BNXT_ULP_ACT_HID_29bc0,
+	.act_pattern_id = 71,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[457] = {
+	.act_hid = BNXT_ULP_ACT_HID_9fa0,
+	.act_pattern_id = 72,
+	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[458] = {
+	.act_hid = BNXT_ULP_ACT_HID_23820,
+	.act_pattern_id = 73,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
-		BNXT_ULP_ACT_BIT_SET_VLAN_PCP |
-		BNXT_ULP_ACT_BIT_SET_VLAN_VID |
-		BNXT_ULP_ACT_BIT_PUSH_VLAN |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
-	.act_tid = 6
+	.act_tid = 7
 	},
-	[304] = {
-	.act_hid = BNXT_ULP_ACT_HID_436c,
-	.act_pattern_id = 13,
+	[459] = {
+	.act_hid = BNXT_ULP_ACT_HID_12820,
+	.act_pattern_id = 74,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[460] = {
+	.act_hid = BNXT_ULP_ACT_HID_7b40,
+	.act_pattern_id = 75,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
-		BNXT_ULP_ACT_BIT_SET_VLAN_VID |
-		BNXT_ULP_ACT_BIT_PUSH_VLAN |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
-	.act_tid = 6
+	.act_tid = 7
 	},
-	[305] = {
-	.act_hid = BNXT_ULP_ACT_HID_1436,
-	.act_pattern_id = 14,
+	[461] = {
+	.act_hid = BNXT_ULP_ACT_HID_213c0,
+	.act_pattern_id = 76,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
-	.act_tid = 6
+	.act_tid = 7
 	},
-	[306] = {
-	.act_hid = BNXT_ULP_ACT_HID_143e,
-	.act_pattern_id = 15,
+	[462] = {
+	.act_hid = BNXT_ULP_ACT_HID_29c40,
+	.act_pattern_id = 77,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_DROP |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
-	.act_tid = 6
+	.act_tid = 7
 	},
-	[307] = {
-	.act_hid = BNXT_ULP_ACT_HID_144e,
-	.act_pattern_id = 16,
+	[463] = {
+	.act_hid = BNXT_ULP_ACT_HID_df20,
+	.act_pattern_id = 78,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_DROP |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[464] = {
+	.act_hid = BNXT_ULP_ACT_HID_277a0,
+	.act_pattern_id = 79,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[465] = {
+	.act_hid = BNXT_ULP_ACT_HID_167a0,
+	.act_pattern_id = 80,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[466] = {
+	.act_hid = BNXT_ULP_ACT_HID_bac0,
+	.act_pattern_id = 81,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[467] = {
+	.act_hid = BNXT_ULP_ACT_HID_25340,
+	.act_pattern_id = 82,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[468] = {
+	.act_hid = BNXT_ULP_ACT_HID_2dbc0,
+	.act_pattern_id = 83,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[469] = {
+	.act_hid = BNXT_ULP_ACT_HID_dfa0,
+	.act_pattern_id = 84,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
-	.act_tid = 6
+	.act_tid = 7
 	},
-	[308] = {
-	.act_hid = BNXT_ULP_ACT_HID_6102,
-	.act_pattern_id = 17,
+	[470] = {
+	.act_hid = BNXT_ULP_ACT_HID_27820,
+	.act_pattern_id = 85,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_SET_VLAN_PCP |
-		BNXT_ULP_ACT_BIT_SET_VLAN_VID |
-		BNXT_ULP_ACT_BIT_PUSH_VLAN |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
-	.act_tid = 6
+	.act_tid = 7
 	},
-	[309] = {
-	.act_hid = BNXT_ULP_ACT_HID_5cbe,
-	.act_pattern_id = 18,
+	[471] = {
+	.act_hid = BNXT_ULP_ACT_HID_16820,
+	.act_pattern_id = 86,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_SET_VLAN_VID |
-		BNXT_ULP_ACT_BIT_PUSH_VLAN |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
-	.act_tid = 6
+	.act_tid = 7
+	},
+	[472] = {
+	.act_hid = BNXT_ULP_ACT_HID_bb40,
+	.act_pattern_id = 87,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[473] = {
+	.act_hid = BNXT_ULP_ACT_HID_253c0,
+	.act_pattern_id = 88,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[474] = {
+	.act_hid = BNXT_ULP_ACT_HID_2dc40,
+	.act_pattern_id = 89,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[475] = {
+	.act_hid = BNXT_ULP_ACT_HID_11f20,
+	.act_pattern_id = 90,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[476] = {
+	.act_hid = BNXT_ULP_ACT_HID_2b7a0,
+	.act_pattern_id = 91,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
+	},
+	[477] = {
+	.act_hid = BNXT_ULP_ACT_HID_1a7a0,
+	.act_pattern_id = 92,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 7
 	},
-	[310] = {
-	.act_hid = BNXT_ULP_ACT_HID_2dbe,
-	.act_pattern_id = 19,
+	[478] = {
+	.act_hid = BNXT_ULP_ACT_HID_fac0,
+	.act_pattern_id = 93,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
-	.act_tid = 6
+	.act_tid = 7
 	},
-	[311] = {
-	.act_hid = BNXT_ULP_ACT_HID_7a8a,
-	.act_pattern_id = 20,
+	[479] = {
+	.act_hid = BNXT_ULP_ACT_HID_29340,
+	.act_pattern_id = 94,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
-		BNXT_ULP_ACT_BIT_SET_VLAN_PCP |
-		BNXT_ULP_ACT_BIT_SET_VLAN_VID |
-		BNXT_ULP_ACT_BIT_PUSH_VLAN |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
-	.act_tid = 6
+	.act_tid = 7
 	},
-	[312] = {
-	.act_hid = BNXT_ULP_ACT_HID_7646,
-	.act_pattern_id = 21,
+	[480] = {
+	.act_hid = BNXT_ULP_ACT_HID_31bc0,
+	.act_pattern_id = 95,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
-		BNXT_ULP_ACT_BIT_SET_VLAN_VID |
-		BNXT_ULP_ACT_BIT_PUSH_VLAN |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
-	.act_tid = 6
+	.act_tid = 7
 	},
-	[313] = {
-	.act_hid = BNXT_ULP_ACT_HID_1446,
-	.act_pattern_id = 22,
+	[481] = {
+	.act_hid = BNXT_ULP_ACT_HID_11fa0,
+	.act_pattern_id = 96,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
-	.act_tid = 6
+	.act_tid = 7
 	},
-	[314] = {
-	.act_hid = BNXT_ULP_ACT_HID_6112,
-	.act_pattern_id = 23,
+	[482] = {
+	.act_hid = BNXT_ULP_ACT_HID_2b820,
+	.act_pattern_id = 97,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
-		BNXT_ULP_ACT_BIT_SET_VLAN_PCP |
-		BNXT_ULP_ACT_BIT_SET_VLAN_VID |
-		BNXT_ULP_ACT_BIT_PUSH_VLAN |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
-	.act_tid = 6
+	.act_tid = 7
 	},
-	[315] = {
-	.act_hid = BNXT_ULP_ACT_HID_5cce,
-	.act_pattern_id = 24,
+	[483] = {
+	.act_hid = BNXT_ULP_ACT_HID_1a820,
+	.act_pattern_id = 98,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
-		BNXT_ULP_ACT_BIT_SET_VLAN_VID |
-		BNXT_ULP_ACT_BIT_PUSH_VLAN |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
-	.act_tid = 6
+	.act_tid = 7
 	},
-	[316] = {
-	.act_hid = BNXT_ULP_ACT_HID_2dce,
-	.act_pattern_id = 25,
+	[484] = {
+	.act_hid = BNXT_ULP_ACT_HID_fb40,
+	.act_pattern_id = 99,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
-	.act_tid = 6
+	.act_tid = 7
 	},
-	[317] = {
-	.act_hid = BNXT_ULP_ACT_HID_7a9a,
-	.act_pattern_id = 26,
+	[485] = {
+	.act_hid = BNXT_ULP_ACT_HID_293c0,
+	.act_pattern_id = 100,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
-		BNXT_ULP_ACT_BIT_SET_VLAN_PCP |
-		BNXT_ULP_ACT_BIT_SET_VLAN_VID |
-		BNXT_ULP_ACT_BIT_PUSH_VLAN |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
-	.act_tid = 6
+	.act_tid = 7
 	},
-	[318] = {
-	.act_hid = BNXT_ULP_ACT_HID_7656,
-	.act_pattern_id = 27,
+	[486] = {
+	.act_hid = BNXT_ULP_ACT_HID_31c40,
+	.act_pattern_id = 101,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
-		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
-		BNXT_ULP_ACT_BIT_SET_VLAN_VID |
-		BNXT_ULP_ACT_BIT_PUSH_VLAN |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
+		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
+		BNXT_ULP_ACT_BIT_SET_TP_SRC |
+		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
-	.act_tid = 6
+	.act_tid = 7
 	},
-	[319] = {
-	.act_hid = BNXT_ULP_ACT_HID_6508,
-	.act_pattern_id = 0,
+	[487] = {
+	.act_hid = BNXT_ULP_ACT_HID_e1a2,
+	.act_pattern_id = 102,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[320] = {
-	.act_hid = BNXT_ULP_ACT_HID_6d08,
-	.act_pattern_id = 1,
+	[488] = {
+	.act_hid = BNXT_ULP_ACT_HID_121a2,
+	.act_pattern_id = 103,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[321] = {
-	.act_hid = BNXT_ULP_ACT_HID_7508,
-	.act_pattern_id = 2,
+	[489] = {
+	.act_hid = BNXT_ULP_ACT_HID_161a2,
+	.act_pattern_id = 104,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[322] = {
-	.act_hid = BNXT_ULP_ACT_HID_6518,
-	.act_pattern_id = 3,
+	[490] = {
+	.act_hid = BNXT_ULP_ACT_HID_e222,
+	.act_pattern_id = 105,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[323] = {
-	.act_hid = BNXT_ULP_ACT_HID_6d18,
-	.act_pattern_id = 4,
+	[491] = {
+	.act_hid = BNXT_ULP_ACT_HID_12222,
+	.act_pattern_id = 106,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[324] = {
-	.act_hid = BNXT_ULP_ACT_HID_7518,
-	.act_pattern_id = 5,
+	[492] = {
+	.act_hid = BNXT_ULP_ACT_HID_16222,
+	.act_pattern_id = 107,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[325] = {
-	.act_hid = BNXT_ULP_ACT_HID_6e18,
-	.act_pattern_id = 6,
+	[493] = {
+	.act_hid = BNXT_ULP_ACT_HID_12a22,
+	.act_pattern_id = 108,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[326] = {
-	.act_hid = BNXT_ULP_ACT_HID_256c,
-	.act_pattern_id = 7,
+	[494] = {
+	.act_hid = BNXT_ULP_ACT_HID_2c2a2,
+	.act_pattern_id = 109,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[327] = {
-	.act_hid = BNXT_ULP_ACT_HID_036c,
-	.act_pattern_id = 8,
+	[495] = {
+	.act_hid = BNXT_ULP_ACT_HID_1b2a2,
+	.act_pattern_id = 110,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[328] = {
-	.act_hid = BNXT_ULP_ACT_HID_698c,
-	.act_pattern_id = 9,
+	[496] = {
+	.act_hid = BNXT_ULP_ACT_HID_105c2,
+	.act_pattern_id = 111,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[329] = {
-	.act_hid = BNXT_ULP_ACT_HID_20e0,
-	.act_pattern_id = 10,
+	[497] = {
+	.act_hid = BNXT_ULP_ACT_HID_29e42,
+	.act_pattern_id = 112,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[330] = {
-	.act_hid = BNXT_ULP_ACT_HID_31f0,
-	.act_pattern_id = 11,
+	[498] = {
+	.act_hid = BNXT_ULP_ACT_HID_326c2,
+	.act_pattern_id = 113,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
@@ -4472,53 +6656,58 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[331] = {
-	.act_hid = BNXT_ULP_ACT_HID_7618,
-	.act_pattern_id = 12,
+	[499] = {
+	.act_hid = BNXT_ULP_ACT_HID_16a22,
+	.act_pattern_id = 114,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[332] = {
-	.act_hid = BNXT_ULP_ACT_HID_2d6c,
-	.act_pattern_id = 13,
+	[500] = {
+	.act_hid = BNXT_ULP_ACT_HID_302a2,
+	.act_pattern_id = 115,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[333] = {
-	.act_hid = BNXT_ULP_ACT_HID_0b6c,
-	.act_pattern_id = 14,
+	[501] = {
+	.act_hid = BNXT_ULP_ACT_HID_1f2a2,
+	.act_pattern_id = 116,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[334] = {
-	.act_hid = BNXT_ULP_ACT_HID_718c,
-	.act_pattern_id = 15,
+	[502] = {
+	.act_hid = BNXT_ULP_ACT_HID_145c2,
+	.act_pattern_id = 117,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[335] = {
-	.act_hid = BNXT_ULP_ACT_HID_28e0,
-	.act_pattern_id = 16,
+	[503] = {
+	.act_hid = BNXT_ULP_ACT_HID_2de42,
+	.act_pattern_id = 118,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
@@ -4526,11 +6715,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[336] = {
-	.act_hid = BNXT_ULP_ACT_HID_39f0,
-	.act_pattern_id = 17,
+	[504] = {
+	.act_hid = BNXT_ULP_ACT_HID_366c2,
+	.act_pattern_id = 119,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
@@ -4539,53 +6729,58 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[337] = {
-	.act_hid = BNXT_ULP_ACT_HID_025c,
-	.act_pattern_id = 18,
+	[505] = {
+	.act_hid = BNXT_ULP_ACT_HID_1aa22,
+	.act_pattern_id = 120,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[338] = {
-	.act_hid = BNXT_ULP_ACT_HID_356c,
-	.act_pattern_id = 19,
+	[506] = {
+	.act_hid = BNXT_ULP_ACT_HID_342a2,
+	.act_pattern_id = 121,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[339] = {
-	.act_hid = BNXT_ULP_ACT_HID_136c,
-	.act_pattern_id = 20,
+	[507] = {
+	.act_hid = BNXT_ULP_ACT_HID_232a2,
+	.act_pattern_id = 122,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[340] = {
-	.act_hid = BNXT_ULP_ACT_HID_798c,
-	.act_pattern_id = 21,
+	[508] = {
+	.act_hid = BNXT_ULP_ACT_HID_185c2,
+	.act_pattern_id = 123,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[341] = {
-	.act_hid = BNXT_ULP_ACT_HID_30e0,
-	.act_pattern_id = 22,
+	[509] = {
+	.act_hid = BNXT_ULP_ACT_HID_31e42,
+	.act_pattern_id = 124,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
@@ -4593,11 +6788,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[342] = {
-	.act_hid = BNXT_ULP_ACT_HID_41f0,
-	.act_pattern_id = 23,
+	[510] = {
+	.act_hid = BNXT_ULP_ACT_HID_3a6c2,
+	.act_pattern_id = 125,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
@@ -4606,22 +6802,24 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[343] = {
-	.act_hid = BNXT_ULP_ACT_HID_0a5c,
-	.act_pattern_id = 24,
+	[511] = {
+	.act_hid = BNXT_ULP_ACT_HID_1ea22,
+	.act_pattern_id = 126,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[344] = {
-	.act_hid = BNXT_ULP_ACT_HID_3d6c,
-	.act_pattern_id = 25,
+	[512] = {
+	.act_hid = BNXT_ULP_ACT_HID_382a2,
+	.act_pattern_id = 127,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
@@ -4629,22 +6827,24 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[345] = {
-	.act_hid = BNXT_ULP_ACT_HID_1b6c,
-	.act_pattern_id = 26,
+	[513] = {
+	.act_hid = BNXT_ULP_ACT_HID_272a2,
+	.act_pattern_id = 128,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[346] = {
-	.act_hid = BNXT_ULP_ACT_HID_05d0,
-	.act_pattern_id = 27,
+	[514] = {
+	.act_hid = BNXT_ULP_ACT_HID_1c5c2,
+	.act_pattern_id = 129,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
@@ -4652,11 +6852,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[347] = {
-	.act_hid = BNXT_ULP_ACT_HID_38e0,
-	.act_pattern_id = 28,
+	[515] = {
+	.act_hid = BNXT_ULP_ACT_HID_35e42,
+	.act_pattern_id = 130,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
@@ -4665,11 +6866,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[348] = {
-	.act_hid = BNXT_ULP_ACT_HID_49f0,
-	.act_pattern_id = 29,
+	[516] = {
+	.act_hid = BNXT_ULP_ACT_HID_08e2,
+	.act_pattern_id = 131,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
@@ -4679,53 +6881,58 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[349] = {
-	.act_hid = BNXT_ULP_ACT_HID_6e28,
-	.act_pattern_id = 30,
+	[517] = {
+	.act_hid = BNXT_ULP_ACT_HID_12aa2,
+	.act_pattern_id = 132,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[350] = {
-	.act_hid = BNXT_ULP_ACT_HID_257c,
-	.act_pattern_id = 31,
+	[518] = {
+	.act_hid = BNXT_ULP_ACT_HID_2c322,
+	.act_pattern_id = 133,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[351] = {
-	.act_hid = BNXT_ULP_ACT_HID_037c,
-	.act_pattern_id = 32,
+	[519] = {
+	.act_hid = BNXT_ULP_ACT_HID_1b322,
+	.act_pattern_id = 134,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[352] = {
-	.act_hid = BNXT_ULP_ACT_HID_699c,
-	.act_pattern_id = 33,
+	[520] = {
+	.act_hid = BNXT_ULP_ACT_HID_10642,
+	.act_pattern_id = 135,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[353] = {
-	.act_hid = BNXT_ULP_ACT_HID_20f0,
-	.act_pattern_id = 34,
+	[521] = {
+	.act_hid = BNXT_ULP_ACT_HID_29ec2,
+	.act_pattern_id = 136,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
@@ -4733,11 +6940,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[354] = {
-	.act_hid = BNXT_ULP_ACT_HID_3200,
-	.act_pattern_id = 35,
+	[522] = {
+	.act_hid = BNXT_ULP_ACT_HID_32742,
+	.act_pattern_id = 137,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
@@ -4746,22 +6954,24 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[355] = {
-	.act_hid = BNXT_ULP_ACT_HID_7628,
-	.act_pattern_id = 36,
+	[523] = {
+	.act_hid = BNXT_ULP_ACT_HID_16aa2,
+	.act_pattern_id = 138,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[356] = {
-	.act_hid = BNXT_ULP_ACT_HID_2d7c,
-	.act_pattern_id = 37,
+	[524] = {
+	.act_hid = BNXT_ULP_ACT_HID_30322,
+	.act_pattern_id = 139,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
@@ -4769,22 +6979,24 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[357] = {
-	.act_hid = BNXT_ULP_ACT_HID_0b7c,
-	.act_pattern_id = 38,
+	[525] = {
+	.act_hid = BNXT_ULP_ACT_HID_1f322,
+	.act_pattern_id = 140,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[358] = {
-	.act_hid = BNXT_ULP_ACT_HID_719c,
-	.act_pattern_id = 39,
+	[526] = {
+	.act_hid = BNXT_ULP_ACT_HID_14642,
+	.act_pattern_id = 141,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
@@ -4792,11 +7004,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[359] = {
-	.act_hid = BNXT_ULP_ACT_HID_28f0,
-	.act_pattern_id = 40,
+	[527] = {
+	.act_hid = BNXT_ULP_ACT_HID_2dec2,
+	.act_pattern_id = 142,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
@@ -4805,11 +7018,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[360] = {
-	.act_hid = BNXT_ULP_ACT_HID_3a00,
-	.act_pattern_id = 41,
+	[528] = {
+	.act_hid = BNXT_ULP_ACT_HID_36742,
+	.act_pattern_id = 143,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
@@ -4819,22 +7033,24 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[361] = {
-	.act_hid = BNXT_ULP_ACT_HID_026c,
-	.act_pattern_id = 42,
+	[529] = {
+	.act_hid = BNXT_ULP_ACT_HID_1aaa2,
+	.act_pattern_id = 144,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[362] = {
-	.act_hid = BNXT_ULP_ACT_HID_357c,
-	.act_pattern_id = 43,
+	[530] = {
+	.act_hid = BNXT_ULP_ACT_HID_34322,
+	.act_pattern_id = 145,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
@@ -4842,22 +7058,24 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[363] = {
-	.act_hid = BNXT_ULP_ACT_HID_137c,
-	.act_pattern_id = 44,
+	[531] = {
+	.act_hid = BNXT_ULP_ACT_HID_23322,
+	.act_pattern_id = 146,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[364] = {
-	.act_hid = BNXT_ULP_ACT_HID_799c,
-	.act_pattern_id = 45,
+	[532] = {
+	.act_hid = BNXT_ULP_ACT_HID_18642,
+	.act_pattern_id = 147,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
@@ -4865,11 +7083,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[365] = {
-	.act_hid = BNXT_ULP_ACT_HID_30f0,
-	.act_pattern_id = 46,
+	[533] = {
+	.act_hid = BNXT_ULP_ACT_HID_31ec2,
+	.act_pattern_id = 148,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
@@ -4878,11 +7097,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[366] = {
-	.act_hid = BNXT_ULP_ACT_HID_4200,
-	.act_pattern_id = 47,
+	[534] = {
+	.act_hid = BNXT_ULP_ACT_HID_3a742,
+	.act_pattern_id = 149,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
@@ -4892,11 +7112,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[367] = {
-	.act_hid = BNXT_ULP_ACT_HID_0a6c,
-	.act_pattern_id = 48,
+	[535] = {
+	.act_hid = BNXT_ULP_ACT_HID_1eaa2,
+	.act_pattern_id = 150,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_COUNT |
@@ -4904,11 +7125,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[368] = {
-	.act_hid = BNXT_ULP_ACT_HID_3d7c,
-	.act_pattern_id = 49,
+	[536] = {
+	.act_hid = BNXT_ULP_ACT_HID_38322,
+	.act_pattern_id = 151,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_COUNT |
@@ -4917,11 +7139,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[369] = {
-	.act_hid = BNXT_ULP_ACT_HID_1b7c,
-	.act_pattern_id = 50,
+	[537] = {
+	.act_hid = BNXT_ULP_ACT_HID_27322,
+	.act_pattern_id = 152,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_COUNT |
@@ -4929,11 +7152,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[370] = {
-	.act_hid = BNXT_ULP_ACT_HID_05e0,
-	.act_pattern_id = 51,
+	[538] = {
+	.act_hid = BNXT_ULP_ACT_HID_1c642,
+	.act_pattern_id = 153,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_COUNT |
@@ -4942,11 +7166,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[371] = {
-	.act_hid = BNXT_ULP_ACT_HID_38f0,
-	.act_pattern_id = 52,
+	[539] = {
+	.act_hid = BNXT_ULP_ACT_HID_35ec2,
+	.act_pattern_id = 154,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_COUNT |
@@ -4956,11 +7181,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[372] = {
-	.act_hid = BNXT_ULP_ACT_HID_4a00,
-	.act_pattern_id = 53,
+	[540] = {
+	.act_hid = BNXT_ULP_ACT_HID_0962,
+	.act_pattern_id = 155,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_COUNT |
@@ -4971,53 +7197,58 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[373] = {
-	.act_hid = BNXT_ULP_ACT_HID_0be4,
-	.act_pattern_id = 54,
+	[541] = {
+	.act_hid = BNXT_ULP_ACT_HID_1f662,
+	.act_pattern_id = 156,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[374] = {
-	.act_hid = BNXT_ULP_ACT_HID_3ef4,
-	.act_pattern_id = 55,
+	[542] = {
+	.act_hid = BNXT_ULP_ACT_HID_38ee2,
+	.act_pattern_id = 157,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[375] = {
-	.act_hid = BNXT_ULP_ACT_HID_1cf4,
-	.act_pattern_id = 56,
+	[543] = {
+	.act_hid = BNXT_ULP_ACT_HID_27ee2,
+	.act_pattern_id = 158,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[376] = {
-	.act_hid = BNXT_ULP_ACT_HID_0758,
-	.act_pattern_id = 57,
+	[544] = {
+	.act_hid = BNXT_ULP_ACT_HID_1d202,
+	.act_pattern_id = 159,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[377] = {
-	.act_hid = BNXT_ULP_ACT_HID_3a68,
-	.act_pattern_id = 58,
+	[545] = {
+	.act_hid = BNXT_ULP_ACT_HID_36a82,
+	.act_pattern_id = 160,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
@@ -5025,11 +7256,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[378] = {
-	.act_hid = BNXT_ULP_ACT_HID_4b78,
-	.act_pattern_id = 59,
+	[546] = {
+	.act_hid = BNXT_ULP_ACT_HID_1522,
+	.act_pattern_id = 161,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
@@ -5038,22 +7270,24 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[379] = {
-	.act_hid = BNXT_ULP_ACT_HID_0bf4,
-	.act_pattern_id = 60,
+	[547] = {
+	.act_hid = BNXT_ULP_ACT_HID_1f6e2,
+	.act_pattern_id = 162,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[380] = {
-	.act_hid = BNXT_ULP_ACT_HID_3f04,
-	.act_pattern_id = 61,
+	[548] = {
+	.act_hid = BNXT_ULP_ACT_HID_38f62,
+	.act_pattern_id = 163,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
@@ -5061,22 +7295,24 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[381] = {
-	.act_hid = BNXT_ULP_ACT_HID_1d04,
-	.act_pattern_id = 62,
+	[549] = {
+	.act_hid = BNXT_ULP_ACT_HID_27f62,
+	.act_pattern_id = 164,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[382] = {
-	.act_hid = BNXT_ULP_ACT_HID_0768,
-	.act_pattern_id = 63,
+	[550] = {
+	.act_hid = BNXT_ULP_ACT_HID_1d282,
+	.act_pattern_id = 165,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
@@ -5084,11 +7320,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[383] = {
-	.act_hid = BNXT_ULP_ACT_HID_3a78,
-	.act_pattern_id = 64,
+	[551] = {
+	.act_hid = BNXT_ULP_ACT_HID_36b02,
+	.act_pattern_id = 166,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
@@ -5097,11 +7334,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[384] = {
-	.act_hid = BNXT_ULP_ACT_HID_4b88,
-	.act_pattern_id = 65,
+	[552] = {
+	.act_hid = BNXT_ULP_ACT_HID_15a2,
+	.act_pattern_id = 167,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
@@ -5111,11 +7349,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[385] = {
-	.act_hid = BNXT_ULP_ACT_HID_46f4,
-	.act_pattern_id = 66,
+	[553] = {
+	.act_hid = BNXT_ULP_ACT_HID_3cee2,
+	.act_pattern_id = 168,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
@@ -5123,22 +7362,24 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[386] = {
-	.act_hid = BNXT_ULP_ACT_HID_24f4,
-	.act_pattern_id = 67,
+	[554] = {
+	.act_hid = BNXT_ULP_ACT_HID_2bee2,
+	.act_pattern_id = 169,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[387] = {
-	.act_hid = BNXT_ULP_ACT_HID_0f58,
-	.act_pattern_id = 68,
+	[555] = {
+	.act_hid = BNXT_ULP_ACT_HID_21202,
+	.act_pattern_id = 170,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
@@ -5146,22 +7387,24 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[388] = {
-	.act_hid = BNXT_ULP_ACT_HID_13e4,
-	.act_pattern_id = 69,
+	[556] = {
+	.act_hid = BNXT_ULP_ACT_HID_23662,
+	.act_pattern_id = 171,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[389] = {
-	.act_hid = BNXT_ULP_ACT_HID_4268,
-	.act_pattern_id = 70,
+	[557] = {
+	.act_hid = BNXT_ULP_ACT_HID_3aa82,
+	.act_pattern_id = 172,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
@@ -5170,11 +7413,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[390] = {
-	.act_hid = BNXT_ULP_ACT_HID_5378,
-	.act_pattern_id = 71,
+	[558] = {
+	.act_hid = BNXT_ULP_ACT_HID_5522,
+	.act_pattern_id = 173,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
@@ -5184,11 +7428,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[391] = {
-	.act_hid = BNXT_ULP_ACT_HID_13f4,
-	.act_pattern_id = 72,
+	[559] = {
+	.act_hid = BNXT_ULP_ACT_HID_236e2,
+	.act_pattern_id = 174,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
@@ -5196,11 +7441,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[392] = {
-	.act_hid = BNXT_ULP_ACT_HID_4704,
-	.act_pattern_id = 73,
+	[560] = {
+	.act_hid = BNXT_ULP_ACT_HID_3cf62,
+	.act_pattern_id = 175,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
@@ -5209,11 +7455,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[393] = {
-	.act_hid = BNXT_ULP_ACT_HID_2504,
-	.act_pattern_id = 74,
+	[561] = {
+	.act_hid = BNXT_ULP_ACT_HID_2bf62,
+	.act_pattern_id = 176,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
@@ -5221,11 +7468,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[394] = {
-	.act_hid = BNXT_ULP_ACT_HID_0f68,
-	.act_pattern_id = 75,
+	[562] = {
+	.act_hid = BNXT_ULP_ACT_HID_21282,
+	.act_pattern_id = 177,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
@@ -5234,11 +7482,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[395] = {
-	.act_hid = BNXT_ULP_ACT_HID_4278,
-	.act_pattern_id = 76,
+	[563] = {
+	.act_hid = BNXT_ULP_ACT_HID_3ab02,
+	.act_pattern_id = 178,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
@@ -5248,11 +7497,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[396] = {
-	.act_hid = BNXT_ULP_ACT_HID_5388,
-	.act_pattern_id = 77,
+	[564] = {
+	.act_hid = BNXT_ULP_ACT_HID_55a2,
+	.act_pattern_id = 179,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
@@ -5263,22 +7513,24 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[397] = {
-	.act_hid = BNXT_ULP_ACT_HID_1be4,
-	.act_pattern_id = 78,
+	[565] = {
+	.act_hid = BNXT_ULP_ACT_HID_27662,
+	.act_pattern_id = 180,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[398] = {
-	.act_hid = BNXT_ULP_ACT_HID_4ef4,
-	.act_pattern_id = 79,
+	[566] = {
+	.act_hid = BNXT_ULP_ACT_HID_3102,
+	.act_pattern_id = 181,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
@@ -5286,22 +7538,24 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[399] = {
-	.act_hid = BNXT_ULP_ACT_HID_2cf4,
-	.act_pattern_id = 80,
+	[567] = {
+	.act_hid = BNXT_ULP_ACT_HID_2fee2,
+	.act_pattern_id = 182,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[400] = {
-	.act_hid = BNXT_ULP_ACT_HID_1758,
-	.act_pattern_id = 81,
+	[568] = {
+	.act_hid = BNXT_ULP_ACT_HID_25202,
+	.act_pattern_id = 183,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
@@ -5309,11 +7563,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[401] = {
-	.act_hid = BNXT_ULP_ACT_HID_4a68,
-	.act_pattern_id = 82,
+	[569] = {
+	.act_hid = BNXT_ULP_ACT_HID_0ca2,
+	.act_pattern_id = 184,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
@@ -5322,11 +7577,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[402] = {
-	.act_hid = BNXT_ULP_ACT_HID_5b78,
-	.act_pattern_id = 83,
+	[570] = {
+	.act_hid = BNXT_ULP_ACT_HID_9522,
+	.act_pattern_id = 185,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
@@ -5336,11 +7592,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[403] = {
-	.act_hid = BNXT_ULP_ACT_HID_1bf4,
-	.act_pattern_id = 84,
+	[571] = {
+	.act_hid = BNXT_ULP_ACT_HID_276e2,
+	.act_pattern_id = 186,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
@@ -5348,11 +7605,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[404] = {
-	.act_hid = BNXT_ULP_ACT_HID_4f04,
-	.act_pattern_id = 85,
+	[572] = {
+	.act_hid = BNXT_ULP_ACT_HID_3182,
+	.act_pattern_id = 187,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
@@ -5361,11 +7619,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[405] = {
-	.act_hid = BNXT_ULP_ACT_HID_2d04,
-	.act_pattern_id = 86,
+	[573] = {
+	.act_hid = BNXT_ULP_ACT_HID_2ff62,
+	.act_pattern_id = 188,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
@@ -5373,11 +7632,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[406] = {
-	.act_hid = BNXT_ULP_ACT_HID_1768,
-	.act_pattern_id = 87,
+	[574] = {
+	.act_hid = BNXT_ULP_ACT_HID_25282,
+	.act_pattern_id = 189,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
@@ -5386,11 +7646,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[407] = {
-	.act_hid = BNXT_ULP_ACT_HID_4a78,
-	.act_pattern_id = 88,
+	[575] = {
+	.act_hid = BNXT_ULP_ACT_HID_0d22,
+	.act_pattern_id = 190,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
@@ -5400,11 +7661,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[408] = {
-	.act_hid = BNXT_ULP_ACT_HID_5b88,
-	.act_pattern_id = 89,
+	[576] = {
+	.act_hid = BNXT_ULP_ACT_HID_95a2,
+	.act_pattern_id = 191,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
@@ -5415,11 +7677,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[409] = {
-	.act_hid = BNXT_ULP_ACT_HID_23e4,
-	.act_pattern_id = 90,
+	[577] = {
+	.act_hid = BNXT_ULP_ACT_HID_2b662,
+	.act_pattern_id = 192,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
@@ -5427,11 +7690,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[410] = {
-	.act_hid = BNXT_ULP_ACT_HID_56f4,
-	.act_pattern_id = 91,
+	[578] = {
+	.act_hid = BNXT_ULP_ACT_HID_7102,
+	.act_pattern_id = 193,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
@@ -5440,11 +7704,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[411] = {
-	.act_hid = BNXT_ULP_ACT_HID_34f4,
-	.act_pattern_id = 92,
+	[579] = {
+	.act_hid = BNXT_ULP_ACT_HID_33ee2,
+	.act_pattern_id = 194,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
@@ -5452,11 +7717,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[412] = {
-	.act_hid = BNXT_ULP_ACT_HID_1f58,
-	.act_pattern_id = 93,
+	[580] = {
+	.act_hid = BNXT_ULP_ACT_HID_29202,
+	.act_pattern_id = 195,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
@@ -5465,11 +7731,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[413] = {
-	.act_hid = BNXT_ULP_ACT_HID_5268,
-	.act_pattern_id = 94,
+	[581] = {
+	.act_hid = BNXT_ULP_ACT_HID_4ca2,
+	.act_pattern_id = 196,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
@@ -5479,11 +7746,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[414] = {
-	.act_hid = BNXT_ULP_ACT_HID_6378,
-	.act_pattern_id = 95,
+	[582] = {
+	.act_hid = BNXT_ULP_ACT_HID_d522,
+	.act_pattern_id = 197,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
@@ -5494,11 +7762,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[415] = {
-	.act_hid = BNXT_ULP_ACT_HID_23f4,
-	.act_pattern_id = 96,
+	[583] = {
+	.act_hid = BNXT_ULP_ACT_HID_2b6e2,
+	.act_pattern_id = 198,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
@@ -5507,11 +7776,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[416] = {
-	.act_hid = BNXT_ULP_ACT_HID_5704,
-	.act_pattern_id = 97,
+	[584] = {
+	.act_hid = BNXT_ULP_ACT_HID_7182,
+	.act_pattern_id = 199,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
@@ -5521,11 +7791,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[417] = {
-	.act_hid = BNXT_ULP_ACT_HID_3504,
-	.act_pattern_id = 98,
+	[585] = {
+	.act_hid = BNXT_ULP_ACT_HID_33f62,
+	.act_pattern_id = 200,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
@@ -5534,11 +7805,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[418] = {
-	.act_hid = BNXT_ULP_ACT_HID_1f68,
-	.act_pattern_id = 99,
+	[586] = {
+	.act_hid = BNXT_ULP_ACT_HID_29282,
+	.act_pattern_id = 201,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
@@ -5548,11 +7820,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[419] = {
-	.act_hid = BNXT_ULP_ACT_HID_5278,
-	.act_pattern_id = 100,
+	[587] = {
+	.act_hid = BNXT_ULP_ACT_HID_4d22,
+	.act_pattern_id = 202,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
@@ -5563,11 +7836,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[420] = {
-	.act_hid = BNXT_ULP_ACT_HID_6388,
-	.act_pattern_id = 101,
+	[588] = {
+	.act_hid = BNXT_ULP_ACT_HID_d5a2,
+	.act_pattern_id = 203,
 	.app_sig = 0,
 	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
@@ -5579,131 +7853,131 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[421] = {
-	.act_hid = BNXT_ULP_ACT_HID_1c36,
-	.act_pattern_id = 102,
+	[589] = {
+	.act_hid = BNXT_ULP_ACT_HID_3e4e0,
+	.act_pattern_id = 204,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[422] = {
-	.act_hid = BNXT_ULP_ACT_HID_2436,
-	.act_pattern_id = 103,
+	[590] = {
+	.act_hid = BNXT_ULP_ACT_HID_2700,
+	.act_pattern_id = 205,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[423] = {
-	.act_hid = BNXT_ULP_ACT_HID_2c36,
-	.act_pattern_id = 104,
+	[591] = {
+	.act_hid = BNXT_ULP_ACT_HID_6700,
+	.act_pattern_id = 206,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[424] = {
-	.act_hid = BNXT_ULP_ACT_HID_1c46,
-	.act_pattern_id = 105,
+	[592] = {
+	.act_hid = BNXT_ULP_ACT_HID_3e560,
+	.act_pattern_id = 207,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[425] = {
-	.act_hid = BNXT_ULP_ACT_HID_2446,
-	.act_pattern_id = 106,
+	[593] = {
+	.act_hid = BNXT_ULP_ACT_HID_2780,
+	.act_pattern_id = 208,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[426] = {
-	.act_hid = BNXT_ULP_ACT_HID_2c46,
-	.act_pattern_id = 107,
+	[594] = {
+	.act_hid = BNXT_ULP_ACT_HID_6780,
+	.act_pattern_id = 209,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[427] = {
-	.act_hid = BNXT_ULP_ACT_HID_2546,
-	.act_pattern_id = 108,
+	[595] = {
+	.act_hid = BNXT_ULP_ACT_HID_2f80,
+	.act_pattern_id = 210,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[428] = {
-	.act_hid = BNXT_ULP_ACT_HID_5856,
-	.act_pattern_id = 109,
+	[596] = {
+	.act_hid = BNXT_ULP_ACT_HID_1e800,
+	.act_pattern_id = 211,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[429] = {
-	.act_hid = BNXT_ULP_ACT_HID_3656,
-	.act_pattern_id = 110,
+	[597] = {
+	.act_hid = BNXT_ULP_ACT_HID_b800,
+	.act_pattern_id = 212,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[430] = {
-	.act_hid = BNXT_ULP_ACT_HID_20ba,
-	.act_pattern_id = 111,
+	[598] = {
+	.act_hid = BNXT_ULP_ACT_HID_2b20,
+	.act_pattern_id = 213,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[431] = {
-	.act_hid = BNXT_ULP_ACT_HID_53ca,
-	.act_pattern_id = 112,
+	[599] = {
+	.act_hid = BNXT_ULP_ACT_HID_1a3a0,
+	.act_pattern_id = 214,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[432] = {
-	.act_hid = BNXT_ULP_ACT_HID_64da,
-	.act_pattern_id = 113,
+	[600] = {
+	.act_hid = BNXT_ULP_ACT_HID_22c20,
+	.act_pattern_id = 215,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
@@ -5711,58 +7985,58 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[433] = {
-	.act_hid = BNXT_ULP_ACT_HID_2d46,
-	.act_pattern_id = 114,
+	[601] = {
+	.act_hid = BNXT_ULP_ACT_HID_6f80,
+	.act_pattern_id = 216,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[434] = {
-	.act_hid = BNXT_ULP_ACT_HID_6056,
-	.act_pattern_id = 115,
+	[602] = {
+	.act_hid = BNXT_ULP_ACT_HID_22800,
+	.act_pattern_id = 217,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[435] = {
-	.act_hid = BNXT_ULP_ACT_HID_3e56,
-	.act_pattern_id = 116,
+	[603] = {
+	.act_hid = BNXT_ULP_ACT_HID_f800,
+	.act_pattern_id = 218,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[436] = {
-	.act_hid = BNXT_ULP_ACT_HID_28ba,
-	.act_pattern_id = 117,
+	[604] = {
+	.act_hid = BNXT_ULP_ACT_HID_6b20,
+	.act_pattern_id = 219,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[437] = {
-	.act_hid = BNXT_ULP_ACT_HID_5bca,
-	.act_pattern_id = 118,
+	[605] = {
+	.act_hid = BNXT_ULP_ACT_HID_1e3a0,
+	.act_pattern_id = 220,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
@@ -5770,12 +8044,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[438] = {
-	.act_hid = BNXT_ULP_ACT_HID_6cda,
-	.act_pattern_id = 119,
+	[606] = {
+	.act_hid = BNXT_ULP_ACT_HID_26c20,
+	.act_pattern_id = 221,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
@@ -5784,58 +8058,58 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[439] = {
-	.act_hid = BNXT_ULP_ACT_HID_3546,
-	.act_pattern_id = 120,
+	[607] = {
+	.act_hid = BNXT_ULP_ACT_HID_af80,
+	.act_pattern_id = 222,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[440] = {
-	.act_hid = BNXT_ULP_ACT_HID_6856,
-	.act_pattern_id = 121,
+	[608] = {
+	.act_hid = BNXT_ULP_ACT_HID_26800,
+	.act_pattern_id = 223,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[441] = {
-	.act_hid = BNXT_ULP_ACT_HID_4656,
-	.act_pattern_id = 122,
+	[609] = {
+	.act_hid = BNXT_ULP_ACT_HID_13800,
+	.act_pattern_id = 224,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[442] = {
-	.act_hid = BNXT_ULP_ACT_HID_30ba,
-	.act_pattern_id = 123,
+	[610] = {
+	.act_hid = BNXT_ULP_ACT_HID_ab20,
+	.act_pattern_id = 225,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[443] = {
-	.act_hid = BNXT_ULP_ACT_HID_63ca,
-	.act_pattern_id = 124,
+	[611] = {
+	.act_hid = BNXT_ULP_ACT_HID_223a0,
+	.act_pattern_id = 226,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
@@ -5843,12 +8117,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[444] = {
-	.act_hid = BNXT_ULP_ACT_HID_74da,
-	.act_pattern_id = 125,
+	[612] = {
+	.act_hid = BNXT_ULP_ACT_HID_2ac20,
+	.act_pattern_id = 227,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
@@ -5857,24 +8131,24 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[445] = {
-	.act_hid = BNXT_ULP_ACT_HID_3d46,
-	.act_pattern_id = 126,
+	[613] = {
+	.act_hid = BNXT_ULP_ACT_HID_ef80,
+	.act_pattern_id = 228,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[446] = {
-	.act_hid = BNXT_ULP_ACT_HID_7056,
-	.act_pattern_id = 127,
+	[614] = {
+	.act_hid = BNXT_ULP_ACT_HID_2a800,
+	.act_pattern_id = 229,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
@@ -5882,24 +8156,24 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[447] = {
-	.act_hid = BNXT_ULP_ACT_HID_4e56,
-	.act_pattern_id = 128,
+	[615] = {
+	.act_hid = BNXT_ULP_ACT_HID_17800,
+	.act_pattern_id = 230,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[448] = {
-	.act_hid = BNXT_ULP_ACT_HID_38ba,
-	.act_pattern_id = 129,
+	[616] = {
+	.act_hid = BNXT_ULP_ACT_HID_eb20,
+	.act_pattern_id = 231,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
@@ -5907,12 +8181,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[449] = {
-	.act_hid = BNXT_ULP_ACT_HID_6bca,
-	.act_pattern_id = 130,
+	[617] = {
+	.act_hid = BNXT_ULP_ACT_HID_263a0,
+	.act_pattern_id = 232,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
@@ -5921,12 +8195,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[450] = {
-	.act_hid = BNXT_ULP_ACT_HID_011e,
-	.act_pattern_id = 131,
+	[618] = {
+	.act_hid = BNXT_ULP_ACT_HID_2ec20,
+	.act_pattern_id = 233,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
@@ -5936,58 +8210,58 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[451] = {
-	.act_hid = BNXT_ULP_ACT_HID_2556,
-	.act_pattern_id = 132,
+	[619] = {
+	.act_hid = BNXT_ULP_ACT_HID_3000,
+	.act_pattern_id = 234,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[452] = {
-	.act_hid = BNXT_ULP_ACT_HID_5866,
-	.act_pattern_id = 133,
+	[620] = {
+	.act_hid = BNXT_ULP_ACT_HID_1e880,
+	.act_pattern_id = 235,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[453] = {
-	.act_hid = BNXT_ULP_ACT_HID_3666,
-	.act_pattern_id = 134,
+	[621] = {
+	.act_hid = BNXT_ULP_ACT_HID_b880,
+	.act_pattern_id = 236,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[454] = {
-	.act_hid = BNXT_ULP_ACT_HID_20ca,
-	.act_pattern_id = 135,
+	[622] = {
+	.act_hid = BNXT_ULP_ACT_HID_2ba0,
+	.act_pattern_id = 237,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[455] = {
-	.act_hid = BNXT_ULP_ACT_HID_53da,
-	.act_pattern_id = 136,
+	[623] = {
+	.act_hid = BNXT_ULP_ACT_HID_1a420,
+	.act_pattern_id = 238,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
@@ -5995,12 +8269,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[456] = {
-	.act_hid = BNXT_ULP_ACT_HID_64ea,
-	.act_pattern_id = 137,
+	[624] = {
+	.act_hid = BNXT_ULP_ACT_HID_22ca0,
+	.act_pattern_id = 239,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
@@ -6009,24 +8283,24 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[457] = {
-	.act_hid = BNXT_ULP_ACT_HID_2d56,
-	.act_pattern_id = 138,
+	[625] = {
+	.act_hid = BNXT_ULP_ACT_HID_7000,
+	.act_pattern_id = 240,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[458] = {
-	.act_hid = BNXT_ULP_ACT_HID_6066,
-	.act_pattern_id = 139,
+	[626] = {
+	.act_hid = BNXT_ULP_ACT_HID_22880,
+	.act_pattern_id = 241,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
@@ -6034,24 +8308,24 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[459] = {
-	.act_hid = BNXT_ULP_ACT_HID_3e66,
-	.act_pattern_id = 140,
+	[627] = {
+	.act_hid = BNXT_ULP_ACT_HID_f880,
+	.act_pattern_id = 242,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[460] = {
-	.act_hid = BNXT_ULP_ACT_HID_28ca,
-	.act_pattern_id = 141,
+	[628] = {
+	.act_hid = BNXT_ULP_ACT_HID_6ba0,
+	.act_pattern_id = 243,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
@@ -6059,12 +8333,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[461] = {
-	.act_hid = BNXT_ULP_ACT_HID_5bda,
-	.act_pattern_id = 142,
+	[629] = {
+	.act_hid = BNXT_ULP_ACT_HID_1e420,
+	.act_pattern_id = 244,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
@@ -6073,12 +8347,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[462] = {
-	.act_hid = BNXT_ULP_ACT_HID_6cea,
-	.act_pattern_id = 143,
+	[630] = {
+	.act_hid = BNXT_ULP_ACT_HID_26ca0,
+	.act_pattern_id = 245,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
@@ -6088,24 +8362,24 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[463] = {
-	.act_hid = BNXT_ULP_ACT_HID_3556,
-	.act_pattern_id = 144,
+	[631] = {
+	.act_hid = BNXT_ULP_ACT_HID_b000,
+	.act_pattern_id = 246,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[464] = {
-	.act_hid = BNXT_ULP_ACT_HID_6866,
-	.act_pattern_id = 145,
+	[632] = {
+	.act_hid = BNXT_ULP_ACT_HID_26880,
+	.act_pattern_id = 247,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
@@ -6113,24 +8387,24 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[465] = {
-	.act_hid = BNXT_ULP_ACT_HID_4666,
-	.act_pattern_id = 146,
+	[633] = {
+	.act_hid = BNXT_ULP_ACT_HID_13880,
+	.act_pattern_id = 248,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[466] = {
-	.act_hid = BNXT_ULP_ACT_HID_30ca,
-	.act_pattern_id = 147,
+	[634] = {
+	.act_hid = BNXT_ULP_ACT_HID_aba0,
+	.act_pattern_id = 249,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
@@ -6138,12 +8412,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[467] = {
-	.act_hid = BNXT_ULP_ACT_HID_63da,
-	.act_pattern_id = 148,
+	[635] = {
+	.act_hid = BNXT_ULP_ACT_HID_22420,
+	.act_pattern_id = 250,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
@@ -6152,12 +8426,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[468] = {
-	.act_hid = BNXT_ULP_ACT_HID_74ea,
-	.act_pattern_id = 149,
+	[636] = {
+	.act_hid = BNXT_ULP_ACT_HID_2aca0,
+	.act_pattern_id = 251,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
@@ -6167,12 +8441,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[469] = {
-	.act_hid = BNXT_ULP_ACT_HID_3d56,
-	.act_pattern_id = 150,
+	[637] = {
+	.act_hid = BNXT_ULP_ACT_HID_f000,
+	.act_pattern_id = 252,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_COUNT |
@@ -6180,12 +8454,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[470] = {
-	.act_hid = BNXT_ULP_ACT_HID_7066,
-	.act_pattern_id = 151,
+	[638] = {
+	.act_hid = BNXT_ULP_ACT_HID_2a880,
+	.act_pattern_id = 253,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_COUNT |
@@ -6194,12 +8468,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[471] = {
-	.act_hid = BNXT_ULP_ACT_HID_4e66,
-	.act_pattern_id = 152,
+	[639] = {
+	.act_hid = BNXT_ULP_ACT_HID_17880,
+	.act_pattern_id = 254,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_COUNT |
@@ -6207,12 +8481,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[472] = {
-	.act_hid = BNXT_ULP_ACT_HID_38ca,
-	.act_pattern_id = 153,
+	[640] = {
+	.act_hid = BNXT_ULP_ACT_HID_eba0,
+	.act_pattern_id = 255,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_COUNT |
@@ -6221,12 +8495,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[473] = {
-	.act_hid = BNXT_ULP_ACT_HID_6bda,
-	.act_pattern_id = 154,
+	[641] = {
+	.act_hid = BNXT_ULP_ACT_HID_26420,
+	.act_pattern_id = 256,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_COUNT |
@@ -6236,12 +8510,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[474] = {
-	.act_hid = BNXT_ULP_ACT_HID_012e,
-	.act_pattern_id = 155,
+	[642] = {
+	.act_hid = BNXT_ULP_ACT_HID_2eca0,
+	.act_pattern_id = 257,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_COUNT |
@@ -6252,58 +8526,58 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[475] = {
-	.act_hid = BNXT_ULP_ACT_HID_3ece,
-	.act_pattern_id = 156,
+	[643] = {
+	.act_hid = BNXT_ULP_ACT_HID_fbc0,
+	.act_pattern_id = 258,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[476] = {
-	.act_hid = BNXT_ULP_ACT_HID_71de,
-	.act_pattern_id = 157,
+	[644] = {
+	.act_hid = BNXT_ULP_ACT_HID_2b440,
+	.act_pattern_id = 259,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[477] = {
-	.act_hid = BNXT_ULP_ACT_HID_4fde,
-	.act_pattern_id = 158,
+	[645] = {
+	.act_hid = BNXT_ULP_ACT_HID_1a440,
+	.act_pattern_id = 260,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[478] = {
-	.act_hid = BNXT_ULP_ACT_HID_3a42,
-	.act_pattern_id = 159,
+	[646] = {
+	.act_hid = BNXT_ULP_ACT_HID_f760,
+	.act_pattern_id = 261,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[479] = {
-	.act_hid = BNXT_ULP_ACT_HID_6d52,
-	.act_pattern_id = 160,
+	[647] = {
+	.act_hid = BNXT_ULP_ACT_HID_26fe0,
+	.act_pattern_id = 262,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_ACT_BIT_SET_TP_SRC |
@@ -6311,12 +8585,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[480] = {
-	.act_hid = BNXT_ULP_ACT_HID_02a6,
-	.act_pattern_id = 161,
+	[648] = {
+	.act_hid = BNXT_ULP_ACT_HID_2f860,
+	.act_pattern_id = 263,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
@@ -6325,24 +8599,24 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[481] = {
-	.act_hid = BNXT_ULP_ACT_HID_3ede,
-	.act_pattern_id = 162,
+	[649] = {
+	.act_hid = BNXT_ULP_ACT_HID_fc40,
+	.act_pattern_id = 264,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[482] = {
-	.act_hid = BNXT_ULP_ACT_HID_71ee,
-	.act_pattern_id = 163,
+	[650] = {
+	.act_hid = BNXT_ULP_ACT_HID_2b4c0,
+	.act_pattern_id = 265,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
@@ -6350,24 +8624,24 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[483] = {
-	.act_hid = BNXT_ULP_ACT_HID_4fee,
-	.act_pattern_id = 164,
+	[651] = {
+	.act_hid = BNXT_ULP_ACT_HID_1a4c0,
+	.act_pattern_id = 266,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[484] = {
-	.act_hid = BNXT_ULP_ACT_HID_3a52,
-	.act_pattern_id = 165,
+	[652] = {
+	.act_hid = BNXT_ULP_ACT_HID_f7e0,
+	.act_pattern_id = 267,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
@@ -6375,12 +8649,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[485] = {
-	.act_hid = BNXT_ULP_ACT_HID_6d62,
-	.act_pattern_id = 166,
+	[653] = {
+	.act_hid = BNXT_ULP_ACT_HID_27060,
+	.act_pattern_id = 268,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
@@ -6389,12 +8663,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[486] = {
-	.act_hid = BNXT_ULP_ACT_HID_02b6,
-	.act_pattern_id = 167,
+	[654] = {
+	.act_hid = BNXT_ULP_ACT_HID_2f8e0,
+	.act_pattern_id = 269,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
@@ -6404,12 +8678,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[487] = {
-	.act_hid = BNXT_ULP_ACT_HID_79de,
-	.act_pattern_id = 168,
+	[655] = {
+	.act_hid = BNXT_ULP_ACT_HID_2f440,
+	.act_pattern_id = 270,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
@@ -6417,24 +8691,24 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[488] = {
-	.act_hid = BNXT_ULP_ACT_HID_57de,
-	.act_pattern_id = 169,
+	[656] = {
+	.act_hid = BNXT_ULP_ACT_HID_1e440,
+	.act_pattern_id = 271,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[489] = {
-	.act_hid = BNXT_ULP_ACT_HID_4242,
-	.act_pattern_id = 170,
+	[657] = {
+	.act_hid = BNXT_ULP_ACT_HID_13760,
+	.act_pattern_id = 272,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
@@ -6442,24 +8716,24 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[490] = {
-	.act_hid = BNXT_ULP_ACT_HID_46ce,
-	.act_pattern_id = 171,
+	[658] = {
+	.act_hid = BNXT_ULP_ACT_HID_13bc0,
+	.act_pattern_id = 273,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[491] = {
-	.act_hid = BNXT_ULP_ACT_HID_7552,
-	.act_pattern_id = 172,
+	[659] = {
+	.act_hid = BNXT_ULP_ACT_HID_2afe0,
+	.act_pattern_id = 274,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
@@ -6468,12 +8742,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[492] = {
-	.act_hid = BNXT_ULP_ACT_HID_0aa6,
-	.act_pattern_id = 173,
+	[660] = {
+	.act_hid = BNXT_ULP_ACT_HID_33860,
+	.act_pattern_id = 275,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
@@ -6483,12 +8757,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[493] = {
-	.act_hid = BNXT_ULP_ACT_HID_46de,
-	.act_pattern_id = 174,
+	[661] = {
+	.act_hid = BNXT_ULP_ACT_HID_13c40,
+	.act_pattern_id = 276,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
@@ -6496,12 +8770,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[494] = {
-	.act_hid = BNXT_ULP_ACT_HID_79ee,
-	.act_pattern_id = 175,
+	[662] = {
+	.act_hid = BNXT_ULP_ACT_HID_2f4c0,
+	.act_pattern_id = 277,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
@@ -6510,12 +8784,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[495] = {
-	.act_hid = BNXT_ULP_ACT_HID_57ee,
-	.act_pattern_id = 176,
+	[663] = {
+	.act_hid = BNXT_ULP_ACT_HID_1e4c0,
+	.act_pattern_id = 278,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
@@ -6523,12 +8797,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[496] = {
-	.act_hid = BNXT_ULP_ACT_HID_4252,
-	.act_pattern_id = 177,
+	[664] = {
+	.act_hid = BNXT_ULP_ACT_HID_137e0,
+	.act_pattern_id = 279,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
@@ -6537,12 +8811,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[497] = {
-	.act_hid = BNXT_ULP_ACT_HID_7562,
-	.act_pattern_id = 178,
+	[665] = {
+	.act_hid = BNXT_ULP_ACT_HID_2b060,
+	.act_pattern_id = 280,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
@@ -6552,12 +8826,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[498] = {
-	.act_hid = BNXT_ULP_ACT_HID_0ab6,
-	.act_pattern_id = 179,
+	[666] = {
+	.act_hid = BNXT_ULP_ACT_HID_338e0,
+	.act_pattern_id = 281,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
@@ -6568,24 +8842,24 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[499] = {
-	.act_hid = BNXT_ULP_ACT_HID_4ece,
-	.act_pattern_id = 180,
+	[667] = {
+	.act_hid = BNXT_ULP_ACT_HID_17bc0,
+	.act_pattern_id = 282,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[500] = {
-	.act_hid = BNXT_ULP_ACT_HID_0622,
-	.act_pattern_id = 181,
+	[668] = {
+	.act_hid = BNXT_ULP_ACT_HID_33440,
+	.act_pattern_id = 283,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
@@ -6593,24 +8867,24 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[501] = {
-	.act_hid = BNXT_ULP_ACT_HID_5fde,
-	.act_pattern_id = 182,
+	[669] = {
+	.act_hid = BNXT_ULP_ACT_HID_22440,
+	.act_pattern_id = 284,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[502] = {
-	.act_hid = BNXT_ULP_ACT_HID_4a42,
-	.act_pattern_id = 183,
+	[670] = {
+	.act_hid = BNXT_ULP_ACT_HID_17760,
+	.act_pattern_id = 285,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
@@ -6618,12 +8892,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[503] = {
-	.act_hid = BNXT_ULP_ACT_HID_0196,
-	.act_pattern_id = 184,
+	[671] = {
+	.act_hid = BNXT_ULP_ACT_HID_2efe0,
+	.act_pattern_id = 286,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_DST |
@@ -6632,12 +8906,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[504] = {
-	.act_hid = BNXT_ULP_ACT_HID_12a6,
-	.act_pattern_id = 185,
+	[672] = {
+	.act_hid = BNXT_ULP_ACT_HID_37860,
+	.act_pattern_id = 287,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_SET_IPV4_SRC |
@@ -6647,12 +8921,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[505] = {
-	.act_hid = BNXT_ULP_ACT_HID_4ede,
-	.act_pattern_id = 186,
+	[673] = {
+	.act_hid = BNXT_ULP_ACT_HID_17c40,
+	.act_pattern_id = 288,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
@@ -6660,12 +8934,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[506] = {
-	.act_hid = BNXT_ULP_ACT_HID_0632,
-	.act_pattern_id = 187,
+	[674] = {
+	.act_hid = BNXT_ULP_ACT_HID_334c0,
+	.act_pattern_id = 289,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
@@ -6674,12 +8948,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[507] = {
-	.act_hid = BNXT_ULP_ACT_HID_5fee,
-	.act_pattern_id = 188,
+	[675] = {
+	.act_hid = BNXT_ULP_ACT_HID_224c0,
+	.act_pattern_id = 290,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
@@ -6687,12 +8961,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[508] = {
-	.act_hid = BNXT_ULP_ACT_HID_4a52,
-	.act_pattern_id = 189,
+	[676] = {
+	.act_hid = BNXT_ULP_ACT_HID_177e0,
+	.act_pattern_id = 291,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
@@ -6701,12 +8975,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[509] = {
-	.act_hid = BNXT_ULP_ACT_HID_01a6,
-	.act_pattern_id = 190,
+	[677] = {
+	.act_hid = BNXT_ULP_ACT_HID_2f060,
+	.act_pattern_id = 292,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
@@ -6716,12 +8990,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[510] = {
-	.act_hid = BNXT_ULP_ACT_HID_12b6,
-	.act_pattern_id = 191,
+	[678] = {
+	.act_hid = BNXT_ULP_ACT_HID_378e0,
+	.act_pattern_id = 293,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
 		BNXT_ULP_ACT_BIT_COUNT |
@@ -6732,12 +9006,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[511] = {
-	.act_hid = BNXT_ULP_ACT_HID_56ce,
-	.act_pattern_id = 192,
+	[679] = {
+	.act_hid = BNXT_ULP_ACT_HID_1bbc0,
+	.act_pattern_id = 294,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
@@ -6745,12 +9019,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[512] = {
-	.act_hid = BNXT_ULP_ACT_HID_0e22,
-	.act_pattern_id = 193,
+	[680] = {
+	.act_hid = BNXT_ULP_ACT_HID_37440,
+	.act_pattern_id = 295,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
@@ -6759,12 +9033,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[513] = {
-	.act_hid = BNXT_ULP_ACT_HID_67de,
-	.act_pattern_id = 194,
+	[681] = {
+	.act_hid = BNXT_ULP_ACT_HID_26440,
+	.act_pattern_id = 296,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
@@ -6772,12 +9046,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[514] = {
-	.act_hid = BNXT_ULP_ACT_HID_5242,
-	.act_pattern_id = 195,
+	[682] = {
+	.act_hid = BNXT_ULP_ACT_HID_1b760,
+	.act_pattern_id = 297,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
@@ -6786,12 +9060,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[515] = {
-	.act_hid = BNXT_ULP_ACT_HID_0996,
-	.act_pattern_id = 196,
+	[683] = {
+	.act_hid = BNXT_ULP_ACT_HID_32fe0,
+	.act_pattern_id = 298,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
@@ -6801,12 +9075,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[516] = {
-	.act_hid = BNXT_ULP_ACT_HID_1aa6,
-	.act_pattern_id = 197,
+	[684] = {
+	.act_hid = BNXT_ULP_ACT_HID_3b860,
+	.act_pattern_id = 299,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
@@ -6817,12 +9091,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[517] = {
-	.act_hid = BNXT_ULP_ACT_HID_56de,
-	.act_pattern_id = 198,
+	[685] = {
+	.act_hid = BNXT_ULP_ACT_HID_1bc40,
+	.act_pattern_id = 300,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
@@ -6831,12 +9105,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[518] = {
-	.act_hid = BNXT_ULP_ACT_HID_0e32,
-	.act_pattern_id = 199,
+	[686] = {
+	.act_hid = BNXT_ULP_ACT_HID_374c0,
+	.act_pattern_id = 301,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
@@ -6846,12 +9120,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[519] = {
-	.act_hid = BNXT_ULP_ACT_HID_67ee,
-	.act_pattern_id = 200,
+	[687] = {
+	.act_hid = BNXT_ULP_ACT_HID_264c0,
+	.act_pattern_id = 302,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
@@ -6860,12 +9134,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[520] = {
-	.act_hid = BNXT_ULP_ACT_HID_5252,
-	.act_pattern_id = 201,
+	[688] = {
+	.act_hid = BNXT_ULP_ACT_HID_1b7e0,
+	.act_pattern_id = 303,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
@@ -6875,12 +9149,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[521] = {
-	.act_hid = BNXT_ULP_ACT_HID_09a6,
-	.act_pattern_id = 202,
+	[689] = {
+	.act_hid = BNXT_ULP_ACT_HID_33060,
+	.act_pattern_id = 304,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
@@ -6891,12 +9165,12 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[522] = {
-	.act_hid = BNXT_ULP_ACT_HID_1ab6,
-	.act_pattern_id = 203,
+	[690] = {
+	.act_hid = BNXT_ULP_ACT_HID_3b8e0,
+	.act_pattern_id = 305,
 	.app_sig = 0,
 	.act_sig = { .bits =
-		BNXT_ULP_ACT_BIT_SHARED_SAMPLE |
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
 		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
 		BNXT_ULP_ACT_BIT_SET_MAC_DST |
 		BNXT_ULP_ACT_BIT_DEC_TTL |
@@ -6908,8 +9182,8 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 7
 	},
-	[523] = {
-	.act_hid = BNXT_ULP_ACT_HID_31d0,
+	[691] = {
+	.act_hid = BNXT_ULP_ACT_HID_18e80,
 	.act_pattern_id = 0,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -6917,8 +9191,8 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 8
 	},
-	[524] = {
-	.act_hid = BNXT_ULP_ACT_HID_31e0,
+	[692] = {
+	.act_hid = BNXT_ULP_ACT_HID_18f00,
 	.act_pattern_id = 1,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -6927,8 +9201,8 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 8
 	},
-	[525] = {
-	.act_hid = BNXT_ULP_ACT_HID_39d0,
+	[693] = {
+	.act_hid = BNXT_ULP_ACT_HID_1ce80,
 	.act_pattern_id = 2,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -6937,8 +9211,8 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 8
 	},
-	[526] = {
-	.act_hid = BNXT_ULP_ACT_HID_39e0,
+	[694] = {
+	.act_hid = BNXT_ULP_ACT_HID_1cf00,
 	.act_pattern_id = 3,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -6948,8 +9222,8 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 8
 	},
-	[527] = {
-	.act_hid = BNXT_ULP_ACT_HID_41d0,
+	[695] = {
+	.act_hid = BNXT_ULP_ACT_HID_20e80,
 	.act_pattern_id = 4,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -6958,8 +9232,8 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 8
 	},
-	[528] = {
-	.act_hid = BNXT_ULP_ACT_HID_41e0,
+	[696] = {
+	.act_hid = BNXT_ULP_ACT_HID_20f00,
 	.act_pattern_id = 5,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -6969,8 +9243,8 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 8
 	},
-	[529] = {
-	.act_hid = BNXT_ULP_ACT_HID_49d0,
+	[697] = {
+	.act_hid = BNXT_ULP_ACT_HID_24e80,
 	.act_pattern_id = 6,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -6980,8 +9254,8 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 8
 	},
-	[530] = {
-	.act_hid = BNXT_ULP_ACT_HID_49e0,
+	[698] = {
+	.act_hid = BNXT_ULP_ACT_HID_24f00,
 	.act_pattern_id = 7,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -6992,8 +9266,8 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 8
 	},
-	[531] = {
-	.act_hid = BNXT_ULP_ACT_HID_64ba,
+	[699] = {
+	.act_hid = BNXT_ULP_ACT_HID_325c2,
 	.act_pattern_id = 8,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -7002,8 +9276,8 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 8
 	},
-	[532] = {
-	.act_hid = BNXT_ULP_ACT_HID_64ca,
+	[700] = {
+	.act_hid = BNXT_ULP_ACT_HID_32642,
 	.act_pattern_id = 9,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -7013,8 +9287,8 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 8
 	},
-	[533] = {
-	.act_hid = BNXT_ULP_ACT_HID_6cba,
+	[701] = {
+	.act_hid = BNXT_ULP_ACT_HID_365c2,
 	.act_pattern_id = 10,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -7024,8 +9298,8 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 8
 	},
-	[534] = {
-	.act_hid = BNXT_ULP_ACT_HID_6cca,
+	[702] = {
+	.act_hid = BNXT_ULP_ACT_HID_36642,
 	.act_pattern_id = 11,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -7036,8 +9310,8 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 8
 	},
-	[535] = {
-	.act_hid = BNXT_ULP_ACT_HID_74ba,
+	[703] = {
+	.act_hid = BNXT_ULP_ACT_HID_3a5c2,
 	.act_pattern_id = 12,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -7047,8 +9321,8 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 8
 	},
-	[536] = {
-	.act_hid = BNXT_ULP_ACT_HID_74ca,
+	[704] = {
+	.act_hid = BNXT_ULP_ACT_HID_3a642,
 	.act_pattern_id = 13,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -7059,8 +9333,8 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 8
 	},
-	[537] = {
-	.act_hid = BNXT_ULP_ACT_HID_00fe,
+	[705] = {
+	.act_hid = BNXT_ULP_ACT_HID_07e2,
 	.act_pattern_id = 14,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -7071,8 +9345,8 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 8
 	},
-	[538] = {
-	.act_hid = BNXT_ULP_ACT_HID_010e,
+	[706] = {
+	.act_hid = BNXT_ULP_ACT_HID_0862,
 	.act_pattern_id = 15,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -7084,8 +9358,100 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 8
 	},
-	[539] = {
-	.act_hid = BNXT_ULP_ACT_HID_331c,
+	[707] = {
+	.act_hid = BNXT_ULP_ACT_HID_22b20,
+	.act_pattern_id = 16,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_VXLAN_ENCAP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 8
+	},
+	[708] = {
+	.act_hid = BNXT_ULP_ACT_HID_22ba0,
+	.act_pattern_id = 17,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_VXLAN_ENCAP |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 8
+	},
+	[709] = {
+	.act_hid = BNXT_ULP_ACT_HID_26b20,
+	.act_pattern_id = 18,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_VXLAN_ENCAP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 8
+	},
+	[710] = {
+	.act_hid = BNXT_ULP_ACT_HID_26ba0,
+	.act_pattern_id = 19,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_VXLAN_ENCAP |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 8
+	},
+	[711] = {
+	.act_hid = BNXT_ULP_ACT_HID_2ab20,
+	.act_pattern_id = 20,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_VXLAN_ENCAP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 8
+	},
+	[712] = {
+	.act_hid = BNXT_ULP_ACT_HID_2aba0,
+	.act_pattern_id = 21,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_VXLAN_ENCAP |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 8
+	},
+	[713] = {
+	.act_hid = BNXT_ULP_ACT_HID_2eb20,
+	.act_pattern_id = 22,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_VXLAN_ENCAP |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 8
+	},
+	[714] = {
+	.act_hid = BNXT_ULP_ACT_HID_2eba0,
+	.act_pattern_id = 23,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_SET_MAC_SRC |
+		BNXT_ULP_ACT_BIT_SET_MAC_DST |
+		BNXT_ULP_ACT_BIT_VXLAN_ENCAP |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 8
+	},
+	[715] = {
+	.act_hid = BNXT_ULP_ACT_HID_199e0,
 	.act_pattern_id = 0,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -7093,8 +9459,8 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 9
 	},
-	[540] = {
-	.act_hid = BNXT_ULP_ACT_HID_332c,
+	[716] = {
+	.act_hid = BNXT_ULP_ACT_HID_19960,
 	.act_pattern_id = 1,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -7103,8 +9469,8 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 9
 	},
-	[541] = {
-	.act_hid = BNXT_ULP_ACT_HID_6706,
+	[717] = {
+	.act_hid = BNXT_ULP_ACT_HID_33122,
 	.act_pattern_id = 2,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -7113,8 +9479,8 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 9
 	},
-	[542] = {
-	.act_hid = BNXT_ULP_ACT_HID_6716,
+	[718] = {
+	.act_hid = BNXT_ULP_ACT_HID_331a2,
 	.act_pattern_id = 3,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -7124,8 +9490,29 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 9
 	},
-	[543] = {
-	.act_hid = BNXT_ULP_ACT_HID_1b6d,
+	[719] = {
+	.act_hid = BNXT_ULP_ACT_HID_23580,
+	.act_pattern_id = 4,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_VF_TO_VF |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 9
+	},
+	[720] = {
+	.act_hid = BNXT_ULP_ACT_HID_23700,
+	.act_pattern_id = 5,
+	.app_sig = 0,
+	.act_sig = { .bits =
+		BNXT_ULP_ACT_BIT_MULTIPLE_PORT |
+		BNXT_ULP_ACT_BIT_VF_TO_VF |
+		BNXT_ULP_ACT_BIT_COUNT |
+		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
+	.act_tid = 9
+	},
+	[721] = {
+	.act_hid = BNXT_ULP_ACT_HID_db61,
 	.act_pattern_id = 0,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -7135,8 +9522,8 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 10
 	},
-	[544] = {
-	.act_hid = BNXT_ULP_ACT_HID_1b7d,
+	[722] = {
+	.act_hid = BNXT_ULP_ACT_HID_dbe1,
 	.act_pattern_id = 1,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -7147,8 +9534,8 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.act_tid = 10
 	},
-	[545] = {
-	.act_hid = BNXT_ULP_ACT_HID_641a,
+	[723] = {
+	.act_hid = BNXT_ULP_ACT_HID_320ca,
 	.act_pattern_id = 2,
 	.app_sig = 0,
 	.act_sig = { .bits =
@@ -7158,3 +9545,4 @@ struct bnxt_ulp_act_match_info ulp_act_match_list[] = {
 	.act_tid = 10
 	}
 };
+
diff --git a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_class.c b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_class.c
index 1c68502ed0..e6ea114f1b 100644
--- a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_class.c
+++ b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_class.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2014-2023 Broadcom
+ * Copyright(c) 2014-2024 Broadcom
  * All rights reserved.
  */
 
@@ -8184,7 +8184,7 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 	[345] = {
 	.class_hid = BNXT_ULP_CLASS_HID_0daa,
 	.class_tid = 2,
-	.hdr_sig_id = 0,
+	.hdr_sig_id = 13,
 	.flow_sig_id = 20480UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -8196,14 +8196,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_T_VXLAN |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_0_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_2_0_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_0_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_13_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT }
 	},
 	[346] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11b0,
 	.class_tid = 2,
-	.hdr_sig_id = 0,
+	.hdr_sig_id = 13,
 	.flow_sig_id = 20488UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -8215,15 +8215,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_T_VXLAN |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_0_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_2_0_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_2_0_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_0_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_13_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_2_13_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT }
 	},
 	[347] = {
 	.class_hid = BNXT_ULP_CLASS_HID_403f8,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
+	.hdr_sig_id = 14,
 	.flow_sig_id = 81920UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -8235,14 +8235,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_T_VXLAN |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_1_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_14_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_14_BITMASK_O_UDP_DST_PORT }
 	},
 	[348] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4161e,
 	.class_tid = 2,
-	.hdr_sig_id = 1,
+	.hdr_sig_id = 14,
 	.flow_sig_id = 81928UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -8254,15 +8254,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_T_VXLAN |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_2_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_2_1_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_1_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_14_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_2_14_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_14_BITMASK_O_UDP_DST_PORT }
 	},
 	[349] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40439,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
+	.hdr_sig_id = 15,
 	.flow_sig_id = 66304UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -8274,14 +8274,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_T_VXLAN_VNI }
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI }
 	},
 	[350] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41405,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
+	.hdr_sig_id = 15,
 	.flow_sig_id = 68352UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -8293,15 +8293,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_2_BITMASK_T_VXLAN_VNI }
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI }
 	},
 	[351] = {
 	.class_hid = BNXT_ULP_CLASS_HID_51449,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
+	.hdr_sig_id = 15,
 	.flow_sig_id = 328448UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -8313,15 +8313,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_ETH_DMAC }
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_DMAC }
 	},
 	[352] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50b33,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
+	.hdr_sig_id = 15,
 	.flow_sig_id = 330496UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -8333,16 +8333,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_2_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_ETH_DMAC }
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_DMAC }
 	},
 	[353] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48c01,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
+	.hdr_sig_id = 15,
 	.flow_sig_id = 590592UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -8354,15 +8354,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_SMAC }
 	},
 	[354] = {
 	.class_hid = BNXT_ULP_CLASS_HID_483eb,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
+	.hdr_sig_id = 15,
 	.flow_sig_id = 592640UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -8374,16 +8374,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_2_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_SMAC }
 	},
 	[355] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5833f,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
+	.hdr_sig_id = 15,
 	.flow_sig_id = 852736UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -8395,16 +8395,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_SMAC }
 	},
 	[356] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5937b,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
+	.hdr_sig_id = 15,
 	.flow_sig_id = 854784UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -8416,17 +8416,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_2_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_SMAC }
 	},
 	[357] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41875,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
+	.hdr_sig_id = 15,
 	.flow_sig_id = 134284032UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -8438,15 +8438,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[358] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40f5f,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
+	.hdr_sig_id = 15,
 	.flow_sig_id = 134286080UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -8458,16 +8458,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_2_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[359] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50f23,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
+	.hdr_sig_id = 15,
 	.flow_sig_id = 134546176UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -8479,16 +8479,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[360] = {
 	.class_hid = BNXT_ULP_CLASS_HID_51f6f,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
+	.hdr_sig_id = 15,
 	.flow_sig_id = 134548224UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -8500,17 +8500,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_2_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[361] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4875b,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
+	.hdr_sig_id = 15,
 	.flow_sig_id = 134808320UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -8522,16 +8522,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[362] = {
 	.class_hid = BNXT_ULP_CLASS_HID_49727,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
+	.hdr_sig_id = 15,
 	.flow_sig_id = 134810368UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -8543,17 +8543,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_2_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[363] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5976b,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
+	.hdr_sig_id = 15,
 	.flow_sig_id = 135070464UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -8565,17 +8565,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[364] = {
 	.class_hid = BNXT_ULP_CLASS_HID_58655,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
+	.hdr_sig_id = 15,
 	.flow_sig_id = 135072512UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -8587,18 +8587,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_2_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[365] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4125f,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
+	.hdr_sig_id = 15,
 	.flow_sig_id = 268501760UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -8610,15 +8610,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[366] = {
 	.class_hid = BNXT_ULP_CLASS_HID_401f9,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
+	.hdr_sig_id = 15,
 	.flow_sig_id = 268503808UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -8630,16 +8630,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_2_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[367] = {
 	.class_hid = BNXT_ULP_CLASS_HID_501cd,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
+	.hdr_sig_id = 15,
 	.flow_sig_id = 268763904UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -8651,16 +8651,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[368] = {
 	.class_hid = BNXT_ULP_CLASS_HID_51149,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
+	.hdr_sig_id = 15,
 	.flow_sig_id = 268765952UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -8672,17 +8672,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_2_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[369] = {
 	.class_hid = BNXT_ULP_CLASS_HID_49a67,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
+	.hdr_sig_id = 15,
 	.flow_sig_id = 269026048UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -8694,16 +8694,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[370] = {
 	.class_hid = BNXT_ULP_CLASS_HID_489c1,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
+	.hdr_sig_id = 15,
 	.flow_sig_id = 269028096UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -8715,17 +8715,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_2_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[371] = {
 	.class_hid = BNXT_ULP_CLASS_HID_58955,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
+	.hdr_sig_id = 15,
 	.flow_sig_id = 269288192UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -8737,17 +8737,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[372] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59951,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
+	.hdr_sig_id = 15,
 	.flow_sig_id = 269290240UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -8759,18 +8759,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_2_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[373] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40569,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
+	.hdr_sig_id = 15,
 	.flow_sig_id = 402719488UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -8782,16 +8782,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[374] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41575,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
+	.hdr_sig_id = 15,
 	.flow_sig_id = 402721536UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -8803,17 +8803,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_2_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[375] = {
 	.class_hid = BNXT_ULP_CLASS_HID_51579,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
+	.hdr_sig_id = 15,
 	.flow_sig_id = 402981632UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -8825,17 +8825,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[376] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50463,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
+	.hdr_sig_id = 15,
 	.flow_sig_id = 402983680UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -8847,18 +8847,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_2_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[377] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48d71,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
+	.hdr_sig_id = 15,
 	.flow_sig_id = 403243776UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -8870,17 +8870,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[378] = {
 	.class_hid = BNXT_ULP_CLASS_HID_49d7d,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
+	.hdr_sig_id = 15,
 	.flow_sig_id = 403245824UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -8892,18 +8892,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_2_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[379] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59d41,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
+	.hdr_sig_id = 15,
 	.flow_sig_id = 403505920UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -8915,18 +8915,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[380] = {
 	.class_hid = BNXT_ULP_CLASS_HID_58c6b,
 	.class_tid = 2,
-	.hdr_sig_id = 2,
+	.hdr_sig_id = 15,
 	.flow_sig_id = 403507968UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -8938,19 +8938,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_2_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_2_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[381] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10255,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
+	.hdr_sig_id = 16,
 	.flow_sig_id = 265216UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -8962,14 +8962,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_T_VXLAN_VNI }
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_T_VXLAN_VNI }
 	},
 	[382] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11675,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
+	.hdr_sig_id = 16,
 	.flow_sig_id = 273408UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -8981,15 +8981,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_3_BITMASK_T_VXLAN_VNI }
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_16_BITMASK_T_VXLAN_VNI }
 	},
 	[383] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14649,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
+	.hdr_sig_id = 16,
 	.flow_sig_id = 1313792UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9001,15 +9001,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_ETH_DMAC }
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_ETH_DMAC }
 	},
 	[384] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15a69,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
+	.hdr_sig_id = 16,
 	.flow_sig_id = 1321984UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9021,16 +9021,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_3_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_ETH_DMAC }
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_16_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_ETH_DMAC }
 	},
 	[385] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1205b,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
+	.hdr_sig_id = 16,
 	.flow_sig_id = 2362368UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9042,15 +9042,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_ETH_SMAC }
 	},
 	[386] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1347b,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
+	.hdr_sig_id = 16,
 	.flow_sig_id = 2370560UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9062,16 +9062,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_3_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_16_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_ETH_SMAC }
 	},
 	[387] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16bbf,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
+	.hdr_sig_id = 16,
 	.flow_sig_id = 3410944UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9083,16 +9083,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_ETH_SMAC }
 	},
 	[388] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1785f,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
+	.hdr_sig_id = 16,
 	.flow_sig_id = 3419136UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9104,17 +9104,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_3_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_16_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_ETH_SMAC }
 	},
 	[389] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11551,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
+	.hdr_sig_id = 16,
 	.flow_sig_id = 537136128UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9126,15 +9126,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[390] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10897,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
+	.hdr_sig_id = 16,
 	.flow_sig_id = 537144320UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9146,16 +9146,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_3_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_16_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[391] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15955,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
+	.hdr_sig_id = 16,
 	.flow_sig_id = 538184704UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9167,16 +9167,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[392] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14c8b,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
+	.hdr_sig_id = 16,
 	.flow_sig_id = 538192896UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9188,17 +9188,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_3_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_16_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[393] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13b47,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
+	.hdr_sig_id = 16,
 	.flow_sig_id = 539233280UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9210,16 +9210,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[394] = {
 	.class_hid = BNXT_ULP_CLASS_HID_12e85,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
+	.hdr_sig_id = 16,
 	.flow_sig_id = 539241472UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9231,17 +9231,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_3_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_16_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[395] = {
 	.class_hid = BNXT_ULP_CLASS_HID_17f5b,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
+	.hdr_sig_id = 16,
 	.flow_sig_id = 540281856UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9253,17 +9253,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[396] = {
 	.class_hid = BNXT_ULP_CLASS_HID_17299,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
+	.hdr_sig_id = 16,
 	.flow_sig_id = 540290048UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9275,18 +9275,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_3_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_16_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[397] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10fe7,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
+	.hdr_sig_id = 16,
 	.flow_sig_id = 1074007040UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9298,15 +9298,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[398] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10325,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
+	.hdr_sig_id = 16,
 	.flow_sig_id = 1074015232UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9318,16 +9318,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_3_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_16_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[399] = {
 	.class_hid = BNXT_ULP_CLASS_HID_153cb,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
+	.hdr_sig_id = 16,
 	.flow_sig_id = 1075055616UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9339,16 +9339,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[400] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14709,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
+	.hdr_sig_id = 16,
 	.flow_sig_id = 1075063808UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9360,17 +9360,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_3_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_16_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[401] = {
 	.class_hid = BNXT_ULP_CLASS_HID_12dc5,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
+	.hdr_sig_id = 16,
 	.flow_sig_id = 1076104192UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9382,16 +9382,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[402] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1212b,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
+	.hdr_sig_id = 16,
 	.flow_sig_id = 1076112384UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9403,17 +9403,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_3_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_16_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[403] = {
 	.class_hid = BNXT_ULP_CLASS_HID_171c9,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
+	.hdr_sig_id = 16,
 	.flow_sig_id = 1077152768UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9425,17 +9425,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[404] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1650f,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
+	.hdr_sig_id = 16,
 	.flow_sig_id = 1077160960UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9447,18 +9447,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_3_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_16_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[405] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10201,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
+	.hdr_sig_id = 16,
 	.flow_sig_id = 1610877952UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9470,16 +9470,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[406] = {
 	.class_hid = BNXT_ULP_CLASS_HID_116c1,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
+	.hdr_sig_id = 16,
 	.flow_sig_id = 1610886144UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9491,17 +9491,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_3_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_16_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[407] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14605,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
+	.hdr_sig_id = 16,
 	.flow_sig_id = 1611926528UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9513,17 +9513,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[408] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15a05,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
+	.hdr_sig_id = 16,
 	.flow_sig_id = 1611934720UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9535,18 +9535,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_3_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_16_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[409] = {
 	.class_hid = BNXT_ULP_CLASS_HID_12007,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
+	.hdr_sig_id = 16,
 	.flow_sig_id = 1612975104UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9558,17 +9558,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[410] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13407,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
+	.hdr_sig_id = 16,
 	.flow_sig_id = 1612983296UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9580,18 +9580,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_3_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_16_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[411] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1640b,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
+	.hdr_sig_id = 16,
 	.flow_sig_id = 1614023680UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9603,18 +9603,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[412] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1780b,
 	.class_tid = 2,
-	.hdr_sig_id = 3,
+	.hdr_sig_id = 16,
 	.flow_sig_id = 1614031872UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9626,19 +9626,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_3_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_3_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_16_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_16_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[413] = {
 	.class_hid = BNXT_ULP_CLASS_HID_404b0,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 17,
 	.flow_sig_id = 66304UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9650,14 +9650,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_T_VXLAN_VNI }
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_T_VXLAN_VNI }
 	},
 	[414] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4148c,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 17,
 	.flow_sig_id = 68352UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9669,15 +9669,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_4_BITMASK_T_VXLAN_VNI }
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_17_BITMASK_T_VXLAN_VNI }
 	},
 	[415] = {
 	.class_hid = BNXT_ULP_CLASS_HID_514c0,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 17,
 	.flow_sig_id = 328448UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9689,15 +9689,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_ETH_DMAC }
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_ETH_DMAC }
 	},
 	[416] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50bba,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 17,
 	.flow_sig_id = 330496UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9709,16 +9709,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_4_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_ETH_DMAC }
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_17_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_ETH_DMAC }
 	},
 	[417] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48c88,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 17,
 	.flow_sig_id = 590592UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9730,15 +9730,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_ETH_SMAC }
 	},
 	[418] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48362,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 17,
 	.flow_sig_id = 592640UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9750,16 +9750,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_4_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_17_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_ETH_SMAC }
 	},
 	[419] = {
 	.class_hid = BNXT_ULP_CLASS_HID_583b6,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 17,
 	.flow_sig_id = 852736UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9771,16 +9771,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_ETH_SMAC }
 	},
 	[420] = {
 	.class_hid = BNXT_ULP_CLASS_HID_593f2,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 17,
 	.flow_sig_id = 854784UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9792,17 +9792,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_4_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_17_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_ETH_SMAC }
 	},
 	[421] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41f54,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 17,
 	.flow_sig_id = 536937216UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9814,15 +9814,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[422] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40fce,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 17,
 	.flow_sig_id = 536939264UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9834,16 +9834,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_4_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_17_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[423] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50e02,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 17,
 	.flow_sig_id = 537199360UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9855,16 +9855,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[424] = {
 	.class_hid = BNXT_ULP_CLASS_HID_51e5e,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 17,
 	.flow_sig_id = 537201408UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9876,17 +9876,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_4_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_17_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[425] = {
 	.class_hid = BNXT_ULP_CLASS_HID_487ca,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 17,
 	.flow_sig_id = 537461504UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9898,16 +9898,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[426] = {
 	.class_hid = BNXT_ULP_CLASS_HID_49606,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 17,
 	.flow_sig_id = 537463552UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9919,17 +9919,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_4_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_17_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[427] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5965a,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 17,
 	.flow_sig_id = 537723648UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9941,17 +9941,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[428] = {
 	.class_hid = BNXT_ULP_CLASS_HID_58514,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 17,
 	.flow_sig_id = 537725696UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9963,18 +9963,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_4_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_17_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[429] = {
 	.class_hid = BNXT_ULP_CLASS_HID_412c2,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 17,
 	.flow_sig_id = 1073808128UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -9986,15 +9986,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[430] = {
 	.class_hid = BNXT_ULP_CLASS_HID_401ac,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 17,
 	.flow_sig_id = 1073810176UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -10006,16 +10006,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_4_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_17_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[431] = {
 	.class_hid = BNXT_ULP_CLASS_HID_501e0,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 17,
 	.flow_sig_id = 1074070272UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -10027,16 +10027,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[432] = {
 	.class_hid = BNXT_ULP_CLASS_HID_511cc,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 17,
 	.flow_sig_id = 1074072320UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -10048,17 +10048,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_4_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_17_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[433] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4990a,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 17,
 	.flow_sig_id = 1074332416UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -10070,16 +10070,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[434] = {
 	.class_hid = BNXT_ULP_CLASS_HID_489e4,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 17,
 	.flow_sig_id = 1074334464UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -10091,17 +10091,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_4_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_17_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[435] = {
 	.class_hid = BNXT_ULP_CLASS_HID_589c8,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 17,
 	.flow_sig_id = 1074594560UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -10113,17 +10113,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[436] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59804,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 17,
 	.flow_sig_id = 1074596608UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -10135,18 +10135,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_4_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_17_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[437] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40404,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 17,
 	.flow_sig_id = 1610679040UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -10158,16 +10158,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[438] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41440,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 17,
 	.flow_sig_id = 1610681088UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -10179,17 +10179,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_4_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_17_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[439] = {
 	.class_hid = BNXT_ULP_CLASS_HID_51484,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 17,
 	.flow_sig_id = 1610941184UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -10201,17 +10201,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[440] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50b0e,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 17,
 	.flow_sig_id = 1610943232UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -10223,18 +10223,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_4_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_17_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[441] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48c4c,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 17,
 	.flow_sig_id = 1611203328UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -10246,17 +10246,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[442] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48306,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 17,
 	.flow_sig_id = 1611205376UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -10268,18 +10268,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_4_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_17_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[443] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5830a,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 17,
 	.flow_sig_id = 1611465472UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -10291,18 +10291,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[444] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59346,
 	.class_tid = 2,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 17,
 	.flow_sig_id = 1611467520UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -10314,19 +10314,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_4_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_4_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_17_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_17_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[445] = {
 	.class_hid = BNXT_ULP_CLASS_HID_102cc,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 18,
 	.flow_sig_id = 265216UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -10338,14 +10338,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_T_VXLAN_VNI }
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_T_VXLAN_VNI }
 	},
 	[446] = {
 	.class_hid = BNXT_ULP_CLASS_HID_116ec,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 18,
 	.flow_sig_id = 273408UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -10357,15 +10357,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_5_BITMASK_T_VXLAN_VNI }
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_18_BITMASK_T_VXLAN_VNI }
 	},
 	[447] = {
 	.class_hid = BNXT_ULP_CLASS_HID_146d0,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 18,
 	.flow_sig_id = 1313792UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -10377,15 +10377,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_ETH_DMAC }
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_ETH_DMAC }
 	},
 	[448] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15af0,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 18,
 	.flow_sig_id = 1321984UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -10397,16 +10397,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_5_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_ETH_DMAC }
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_18_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_ETH_DMAC }
 	},
 	[449] = {
 	.class_hid = BNXT_ULP_CLASS_HID_120c2,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 18,
 	.flow_sig_id = 2362368UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -10418,15 +10418,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_ETH_SMAC }
 	},
 	[450] = {
 	.class_hid = BNXT_ULP_CLASS_HID_134e2,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 18,
 	.flow_sig_id = 2370560UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -10438,16 +10438,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_5_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_18_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_ETH_SMAC }
 	},
 	[451] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16b26,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 18,
 	.flow_sig_id = 3410944UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -10459,16 +10459,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_ETH_SMAC }
 	},
 	[452] = {
 	.class_hid = BNXT_ULP_CLASS_HID_178c6,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 18,
 	.flow_sig_id = 3419136UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -10480,17 +10480,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_5_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_18_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_ETH_SMAC }
 	},
 	[453] = {
 	.class_hid = BNXT_ULP_CLASS_HID_115c6,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 18,
 	.flow_sig_id = 2147748864UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -10502,15 +10502,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[454] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10804,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 18,
 	.flow_sig_id = 2147757056UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -10522,16 +10522,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_5_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_18_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[455] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15822,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 18,
 	.flow_sig_id = 2148797440UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -10543,16 +10543,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[456] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14c60,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 18,
 	.flow_sig_id = 2148805632UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -10564,17 +10564,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_5_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_18_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[457] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13bd4,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 18,
 	.flow_sig_id = 2149846016UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -10586,16 +10586,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[458] = {
 	.class_hid = BNXT_ULP_CLASS_HID_12e12,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 18,
 	.flow_sig_id = 2149854208UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -10607,17 +10607,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_5_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_18_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[459] = {
 	.class_hid = BNXT_ULP_CLASS_HID_17e30,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 18,
 	.flow_sig_id = 2150894592UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -10629,17 +10629,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[460] = {
 	.class_hid = BNXT_ULP_CLASS_HID_17276,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 18,
 	.flow_sig_id = 2150902784UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -10651,18 +10651,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_5_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_18_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[461] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11f1a,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 18,
 	.flow_sig_id = 4295232512UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -10674,15 +10674,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[462] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11358,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 18,
 	.flow_sig_id = 4295240704UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -10694,16 +10694,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_5_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_18_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[463] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14398,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 18,
 	.flow_sig_id = 4296281088UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -10715,16 +10715,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[464] = {
 	.class_hid = BNXT_ULP_CLASS_HID_157b8,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 18,
 	.flow_sig_id = 4296289280UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -10736,17 +10736,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_5_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_18_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[465] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13d68,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 18,
 	.flow_sig_id = 4297329664UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -10758,16 +10758,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[466] = {
 	.class_hid = BNXT_ULP_CLASS_HID_131aa,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 18,
 	.flow_sig_id = 4297337856UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -10779,17 +10779,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_5_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_18_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[467] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16192,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 18,
 	.flow_sig_id = 4298378240UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -10801,17 +10801,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[468] = {
 	.class_hid = BNXT_ULP_CLASS_HID_175b2,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 18,
 	.flow_sig_id = 4298386432UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -10823,18 +10823,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_5_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_18_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[469] = {
 	.class_hid = BNXT_ULP_CLASS_HID_112b2,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 18,
 	.flow_sig_id = 6442716160UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -10846,16 +10846,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[470] = {
 	.class_hid = BNXT_ULP_CLASS_HID_106f0,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 18,
 	.flow_sig_id = 6442724352UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -10867,17 +10867,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_5_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_18_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[471] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15692,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 18,
 	.flow_sig_id = 6443764736UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -10889,17 +10889,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[472] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14ad0,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 18,
 	.flow_sig_id = 6443772928UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -10911,18 +10911,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_5_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_18_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[473] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13080,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 18,
 	.flow_sig_id = 6444813312UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -10934,17 +10934,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[474] = {
 	.class_hid = BNXT_ULP_CLASS_HID_124c2,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 18,
 	.flow_sig_id = 6444821504UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -10956,18 +10956,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_5_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_18_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[475] = {
 	.class_hid = BNXT_ULP_CLASS_HID_174e0,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 18,
 	.flow_sig_id = 6445861888UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -10979,18 +10979,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[476] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16f22,
 	.class_tid = 2,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 18,
 	.flow_sig_id = 6445870080UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -11002,19 +11002,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_5_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_5_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_18_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_18_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[477] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4025b,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 66304UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -11027,14 +11027,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI }
 	},
 	[478] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41267,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 68352UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -11047,15 +11047,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI }
 	},
 	[479] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5122b,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 328448UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -11068,15 +11068,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC }
 	},
 	[480] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50d51,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 330496UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -11089,16 +11089,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC }
 	},
 	[481] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48a63,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 590592UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -11111,15 +11111,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC }
 	},
 	[482] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48589,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 592640UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -11132,16 +11132,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC }
 	},
 	[483] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5855d,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 852736UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -11154,16 +11154,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC }
 	},
 	[484] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59519,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 854784UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -11176,17 +11176,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC }
 	},
 	[485] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41e17,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 134284032UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -11199,15 +11199,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[486] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4093d,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 134286080UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -11220,16 +11220,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[487] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50941,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 134546176UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -11242,16 +11242,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[488] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5190d,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 134548224UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -11264,17 +11264,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[489] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48139,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 134808320UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -11287,16 +11287,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[490] = {
 	.class_hid = BNXT_ULP_CLASS_HID_49145,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 134810368UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -11309,17 +11309,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[491] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59109,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 135070464UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -11332,17 +11332,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[492] = {
 	.class_hid = BNXT_ULP_CLASS_HID_58037,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 135072512UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -11355,18 +11355,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[493] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4143d,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 268501760UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -11379,15 +11379,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[494] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4079b,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 268503808UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -11400,16 +11400,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[495] = {
 	.class_hid = BNXT_ULP_CLASS_HID_507af,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 268763904UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -11422,16 +11422,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[496] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5172b,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 268765952UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -11444,17 +11444,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[497] = {
 	.class_hid = BNXT_ULP_CLASS_HID_49c05,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 269026048UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -11467,16 +11467,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[498] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48fa3,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 269028096UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -11489,17 +11489,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[499] = {
 	.class_hid = BNXT_ULP_CLASS_HID_58f37,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 269288192UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -11512,17 +11512,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[500] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59f33,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 269290240UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -11535,18 +11535,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[501] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4030b,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 402719488UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -11559,16 +11559,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[502] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41317,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 402721536UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -11581,17 +11581,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[503] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5131b,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 402981632UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -11604,17 +11604,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[504] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50201,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 402983680UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -11627,18 +11627,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[505] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48b13,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 403243776UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -11651,17 +11651,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[506] = {
 	.class_hid = BNXT_ULP_CLASS_HID_49b1f,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 403245824UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -11674,18 +11674,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[507] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59b23,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 403505920UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -11698,18 +11698,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[508] = {
 	.class_hid = BNXT_ULP_CLASS_HID_58a09,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 403507968UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -11722,19 +11722,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[509] = {
 	.class_hid = BNXT_ULP_CLASS_HID_419bf,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 536937216UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -11747,15 +11747,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT }
 	},
 	[510] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40925,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 536939264UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -11768,16 +11768,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT }
 	},
 	[511] = {
 	.class_hid = BNXT_ULP_CLASS_HID_508e9,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 537199360UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -11790,16 +11790,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT }
 	},
 	[512] = {
 	.class_hid = BNXT_ULP_CLASS_HID_518b5,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 537201408UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -11812,17 +11812,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT }
 	},
 	[513] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48121,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 537461504UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -11835,16 +11835,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT }
 	},
 	[514] = {
 	.class_hid = BNXT_ULP_CLASS_HID_490ed,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 537463552UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -11857,17 +11857,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT }
 	},
 	[515] = {
 	.class_hid = BNXT_ULP_CLASS_HID_590b1,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 537723648UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -11880,17 +11880,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT }
 	},
 	[516] = {
 	.class_hid = BNXT_ULP_CLASS_HID_583ff,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 537725696UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -11903,18 +11903,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT }
 	},
 	[517] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41475,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 671154944UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -11927,16 +11927,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT }
 	},
 	[518] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40473,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 671156992UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -11949,17 +11949,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT }
 	},
 	[519] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50427,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 671417088UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -11972,17 +11972,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT }
 	},
 	[520] = {
 	.class_hid = BNXT_ULP_CLASS_HID_51763,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 671419136UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -11995,18 +11995,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT }
 	},
 	[521] = {
 	.class_hid = BNXT_ULP_CLASS_HID_49c3d,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 671679232UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -12019,17 +12019,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT }
 	},
 	[522] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48c3b,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 671681280UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -12042,18 +12042,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT }
 	},
 	[523] = {
 	.class_hid = BNXT_ULP_CLASS_HID_58f6f,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 671941376UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -12066,18 +12066,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT }
 	},
 	[524] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59f2b,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 671943424UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -12090,19 +12090,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT }
 	},
 	[525] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40333,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 805372672UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -12115,16 +12115,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT }
 	},
 	[526] = {
 	.class_hid = BNXT_ULP_CLASS_HID_412bf,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 805374720UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -12137,17 +12137,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT }
 	},
 	[527] = {
 	.class_hid = BNXT_ULP_CLASS_HID_512a3,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 805634816UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -12160,17 +12160,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT }
 	},
 	[528] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50229,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 805636864UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -12183,18 +12183,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT }
 	},
 	[529] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48abb,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 805896960UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -12207,17 +12207,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT }
 	},
 	[530] = {
 	.class_hid = BNXT_ULP_CLASS_HID_49aa7,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 805899008UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -12230,18 +12230,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT }
 	},
 	[531] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59a2b,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 806159104UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -12254,18 +12254,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT }
 	},
 	[532] = {
 	.class_hid = BNXT_ULP_CLASS_HID_595b1,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 806161152UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -12278,19 +12278,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT }
 	},
 	[533] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41e2f,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 939590400UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -12303,17 +12303,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT }
 	},
 	[534] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40e35,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 939592448UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -12326,18 +12326,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT }
 	},
 	[535] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50939,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 939852544UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -12350,18 +12350,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT }
 	},
 	[536] = {
 	.class_hid = BNXT_ULP_CLASS_HID_51925,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 939854592UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -12374,19 +12374,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT }
 	},
 	[537] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48631,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 940114688UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -12399,18 +12399,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT }
 	},
 	[538] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4913d,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 940116736UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -12423,19 +12423,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT }
 	},
 	[539] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59121,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 940376832UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -12448,19 +12448,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT }
 	},
 	[540] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5812f,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 940378880UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -12473,20 +12473,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT }
 	},
 	[541] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41429,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1073808128UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -12499,15 +12499,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[542] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40747,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1073810176UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -12520,16 +12520,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[543] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5070b,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1074070272UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -12542,16 +12542,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[544] = {
 	.class_hid = BNXT_ULP_CLASS_HID_51727,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1074072320UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -12564,17 +12564,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[545] = {
 	.class_hid = BNXT_ULP_CLASS_HID_49fe1,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1074332416UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -12587,16 +12587,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[546] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48f0f,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1074334464UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -12609,17 +12609,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[547] = {
 	.class_hid = BNXT_ULP_CLASS_HID_58f23,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1074594560UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -12632,17 +12632,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[548] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59eef,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1074596608UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -12655,18 +12655,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[549] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40347,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1208025856UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -12679,16 +12679,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[550] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41303,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1208027904UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -12701,17 +12701,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[551] = {
 	.class_hid = BNXT_ULP_CLASS_HID_51247,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1208288000UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -12724,17 +12724,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[552] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5026d,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1208290048UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -12747,18 +12747,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[553] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48b0f,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1208550144UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -12771,17 +12771,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[554] = {
 	.class_hid = BNXT_ULP_CLASS_HID_49a4b,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1208552192UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -12794,18 +12794,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[555] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59a0f,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1208812288UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -12818,18 +12818,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[556] = {
 	.class_hid = BNXT_ULP_CLASS_HID_58a05,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1208814336UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -12842,19 +12842,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[557] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41983,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1342243584UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -12867,16 +12867,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[558] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40929,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1342245632UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -12889,17 +12889,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[559] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5092d,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1342505728UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -12912,17 +12912,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[560] = {
 	.class_hid = BNXT_ULP_CLASS_HID_518a9,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1342507776UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -12935,18 +12935,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[561] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48125,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1342767872UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -12959,17 +12959,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[562] = {
 	.class_hid = BNXT_ULP_CLASS_HID_49121,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1342769920UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -12982,18 +12982,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[563] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59085,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1343030016UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -13006,18 +13006,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[564] = {
 	.class_hid = BNXT_ULP_CLASS_HID_58023,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1343032064UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -13030,19 +13030,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[565] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41509,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1476461312UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -13055,17 +13055,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[566] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40407,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1476463360UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -13078,18 +13078,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[567] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5040b,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1476723456UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -13102,18 +13102,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[568] = {
 	.class_hid = BNXT_ULP_CLASS_HID_51407,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1476725504UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -13126,19 +13126,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[569] = {
 	.class_hid = BNXT_ULP_CLASS_HID_49d21,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1476985600UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -13151,18 +13151,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[570] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48c0f,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1476987648UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -13175,19 +13175,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[571] = {
 	.class_hid = BNXT_ULP_CLASS_HID_58c03,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1477247744UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -13200,19 +13200,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[572] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59f0f,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1477249792UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -13225,20 +13225,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[573] = {
 	.class_hid = BNXT_ULP_CLASS_HID_402ef,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1610679040UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -13251,16 +13251,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[574] = {
 	.class_hid = BNXT_ULP_CLASS_HID_412ab,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1610681088UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -13273,17 +13273,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[575] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5126f,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1610941184UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -13296,17 +13296,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[576] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50de5,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1610943232UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -13319,18 +13319,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[577] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48aa7,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1611203328UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -13343,17 +13343,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[578] = {
 	.class_hid = BNXT_ULP_CLASS_HID_485ed,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1611205376UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -13366,18 +13366,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[579] = {
 	.class_hid = BNXT_ULP_CLASS_HID_585e1,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1611465472UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -13390,18 +13390,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[580] = {
 	.class_hid = BNXT_ULP_CLASS_HID_595ad,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1611467520UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -13414,19 +13414,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[581] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41e6b,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1744896768UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -13439,17 +13439,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[582] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40961,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1744898816UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -13462,18 +13462,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[583] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50925,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1745158912UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -13486,18 +13486,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[584] = {
 	.class_hid = BNXT_ULP_CLASS_HID_51961,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1745160960UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -13510,19 +13510,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[585] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4816d,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1745421056UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -13535,18 +13535,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[586] = {
 	.class_hid = BNXT_ULP_CLASS_HID_49129,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1745423104UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -13559,19 +13559,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[587] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5916d,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1745683200UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -13584,19 +13584,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[588] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5806b,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1745685248UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -13609,20 +13609,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[589] = {
 	.class_hid = BNXT_ULP_CLASS_HID_414a1,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1879114496UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -13635,17 +13635,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[590] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4042f,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1879116544UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -13658,18 +13658,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[591] = {
 	.class_hid = BNXT_ULP_CLASS_HID_507a3,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1879376640UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -13682,18 +13682,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[592] = {
 	.class_hid = BNXT_ULP_CLASS_HID_517af,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1879378688UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -13706,19 +13706,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[593] = {
 	.class_hid = BNXT_ULP_CLASS_HID_49c29,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1879638784UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -13731,18 +13731,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[594] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48fa7,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1879640832UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -13755,19 +13755,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[595] = {
 	.class_hid = BNXT_ULP_CLASS_HID_58fab,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1879900928UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -13780,19 +13780,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[596] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59f27,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 1879902976UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -13805,20 +13805,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[597] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4032f,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 2013332224UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -13831,18 +13831,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[598] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4132b,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 2013334272UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -13855,19 +13855,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[599] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5132f,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 2013594368UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -13880,19 +13880,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[600] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50225,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 2013596416UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -13905,20 +13905,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[601] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48b27,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 2013856512UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -13931,19 +13931,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[602] = {
 	.class_hid = BNXT_ULP_CLASS_HID_49b23,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 2013858560UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -13956,20 +13956,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[603] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59b27,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 2014118656UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -13982,20 +13982,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[604] = {
 	.class_hid = BNXT_ULP_CLASS_HID_58a2d,
 	.class_tid = 2,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 19,
 	.flow_sig_id = 2014120704UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -14008,21 +14008,21 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT }
 	},
 	[605] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10437,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 265216UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -14035,14 +14035,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI }
 	},
 	[606] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11017,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 273408UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -14055,15 +14055,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI }
 	},
 	[607] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1402b,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 1313792UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -14076,15 +14076,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC }
 	},
 	[608] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15c0b,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 1321984UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -14097,16 +14097,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC }
 	},
 	[609] = {
 	.class_hid = BNXT_ULP_CLASS_HID_12639,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 2362368UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -14119,15 +14119,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC }
 	},
 	[610] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13219,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 2370560UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -14140,16 +14140,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC }
 	},
 	[611] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16ddd,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 3410944UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -14162,16 +14162,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC }
 	},
 	[612] = {
 	.class_hid = BNXT_ULP_CLASS_HID_17e3d,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 3419136UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -14184,17 +14184,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC }
 	},
 	[613] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11333,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 537136128UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -14207,15 +14207,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[614] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10ef5,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 537144320UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -14228,16 +14228,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[615] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15f37,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 538184704UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -14250,16 +14250,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[616] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14ae9,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 538192896UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -14272,17 +14272,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[617] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13d25,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 539233280UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -14295,16 +14295,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[618] = {
 	.class_hid = BNXT_ULP_CLASS_HID_128e7,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 539241472UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -14317,17 +14317,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[619] = {
 	.class_hid = BNXT_ULP_CLASS_HID_17939,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 540281856UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -14340,17 +14340,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[620] = {
 	.class_hid = BNXT_ULP_CLASS_HID_174fb,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 540290048UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -14363,18 +14363,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[621] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10985,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 1074007040UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -14387,15 +14387,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[622] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10547,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 1074015232UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -14408,16 +14408,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[623] = {
 	.class_hid = BNXT_ULP_CLASS_HID_155a9,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 1075055616UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -14430,16 +14430,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[624] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1416b,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 1075063808UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -14452,17 +14452,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[625] = {
 	.class_hid = BNXT_ULP_CLASS_HID_12ba7,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 1076104192UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -14475,16 +14475,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[626] = {
 	.class_hid = BNXT_ULP_CLASS_HID_12749,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 1076112384UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -14497,17 +14497,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[627] = {
 	.class_hid = BNXT_ULP_CLASS_HID_177ab,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 1077152768UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -14520,17 +14520,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[628] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1636d,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 1077160960UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -14543,18 +14543,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[629] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10463,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 1610877952UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -14567,16 +14567,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[630] = {
 	.class_hid = BNXT_ULP_CLASS_HID_110a3,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 1610886144UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -14589,17 +14589,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[631] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14067,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 1611926528UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -14612,17 +14612,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[632] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15c67,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 1611934720UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -14635,18 +14635,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[633] = {
 	.class_hid = BNXT_ULP_CLASS_HID_12665,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 1612975104UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -14659,17 +14659,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[634] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13265,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 1612983296UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -14682,18 +14682,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[635] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16269,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 1614023680UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -14706,18 +14706,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[636] = {
 	.class_hid = BNXT_ULP_CLASS_HID_17e69,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 1614031872UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -14730,19 +14730,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[637] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1133d,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 2147748864UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -14755,15 +14755,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT }
 	},
 	[638] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10eff,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 2147757056UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -14776,16 +14776,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT }
 	},
 	[639] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15ed9,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 2148797440UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -14798,16 +14798,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT }
 	},
 	[640] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14a9b,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 2148805632UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -14820,17 +14820,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT }
 	},
 	[641] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13d2f,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 2149846016UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -14843,16 +14843,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT }
 	},
 	[642] = {
 	.class_hid = BNXT_ULP_CLASS_HID_128e9,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 2149854208UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -14865,17 +14865,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT }
 	},
 	[643] = {
 	.class_hid = BNXT_ULP_CLASS_HID_178cb,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 2150894592UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -14888,17 +14888,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT }
 	},
 	[644] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1748d,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 2150902784UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -14911,18 +14911,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT }
 	},
 	[645] = {
 	.class_hid = BNXT_ULP_CLASS_HID_109fb,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 2684619776UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -14935,16 +14935,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT }
 	},
 	[646] = {
 	.class_hid = BNXT_ULP_CLASS_HID_105bd,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 2684627968UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -14957,17 +14957,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT }
 	},
 	[647] = {
 	.class_hid = BNXT_ULP_CLASS_HID_155bf,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 2685668352UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -14980,17 +14980,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT }
 	},
 	[648] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14179,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 2685676544UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -15003,18 +15003,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT }
 	},
 	[649] = {
 	.class_hid = BNXT_ULP_CLASS_HID_12bed,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 2686716928UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -15027,17 +15027,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT }
 	},
 	[650] = {
 	.class_hid = BNXT_ULP_CLASS_HID_127af,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 2686725120UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -15050,18 +15050,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT }
 	},
 	[651] = {
 	.class_hid = BNXT_ULP_CLASS_HID_177a9,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 2687765504UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -15074,18 +15074,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT }
 	},
 	[652] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1636b,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 2687773696UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -15098,19 +15098,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT }
 	},
 	[653] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1046d,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 3221490688UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -15123,16 +15123,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT }
 	},
 	[654] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1104d,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 3221498880UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -15145,17 +15145,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT }
 	},
 	[655] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14009,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 3222539264UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -15168,17 +15168,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT }
 	},
 	[656] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15c69,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 3222547456UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -15191,18 +15191,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT }
 	},
 	[657] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1260f,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 3223587840UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -15215,17 +15215,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT }
 	},
 	[658] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1326f,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 3223596032UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -15238,18 +15238,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT }
 	},
 	[659] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1622b,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 3224636416UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -15262,18 +15262,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT }
 	},
 	[660] = {
 	.class_hid = BNXT_ULP_CLASS_HID_17e0b,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 3224644608UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -15286,19 +15286,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT }
 	},
 	[661] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11369,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 3758361600UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -15311,17 +15311,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT }
 	},
 	[662] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10f2b,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 3758369792UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -15334,18 +15334,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT }
 	},
 	[663] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15f6d,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 3759410176UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -15358,18 +15358,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT }
 	},
 	[664] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14b2f,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 3759418368UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -15382,19 +15382,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT }
 	},
 	[665] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13d6b,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 3760458752UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -15407,18 +15407,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT }
 	},
 	[666] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1292d,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 3760466944UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -15431,19 +15431,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT }
 	},
 	[667] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1792f,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 3761507328UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -15456,19 +15456,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT }
 	},
 	[668] = {
 	.class_hid = BNXT_ULP_CLASS_HID_174e9,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 3761515520UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -15481,20 +15481,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT }
 	},
 	[669] = {
 	.class_hid = BNXT_ULP_CLASS_HID_119e1,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 4295232512UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -15507,15 +15507,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[670] = {
 	.class_hid = BNXT_ULP_CLASS_HID_115a3,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 4295240704UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -15528,16 +15528,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[671] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14563,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 4296281088UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -15550,16 +15550,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[672] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15143,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 4296289280UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -15572,17 +15572,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[673] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13b93,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 4297329664UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -15595,16 +15595,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[674] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13751,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 4297337856UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -15617,17 +15617,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[675] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16769,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 4298378240UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -15640,17 +15640,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[676] = {
 	.class_hid = BNXT_ULP_CLASS_HID_17349,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 4298386432UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -15663,18 +15663,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[677] = {
 	.class_hid = BNXT_ULP_CLASS_HID_114ab,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 4832103424UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -15687,16 +15687,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[678] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10061,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 4832111616UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -15709,17 +15709,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[679] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15063,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 4833152000UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -15732,17 +15732,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[680] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14c21,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 4833160192UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -15755,18 +15755,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[681] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13671,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 4834200576UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -15779,17 +15779,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[682] = {
 	.class_hid = BNXT_ULP_CLASS_HID_12233,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 4834208768UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -15802,18 +15802,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[683] = {
 	.class_hid = BNXT_ULP_CLASS_HID_17271,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 4835249152UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -15826,18 +15826,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[684] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16e33,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 4835257344UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -15850,19 +15850,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[685] = {
 	.class_hid = BNXT_ULP_CLASS_HID_102c1,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 5368974336UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -15875,16 +15875,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[686] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11f21,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 5368982528UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -15897,17 +15897,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[687] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14ee1,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 5370022912UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -15920,17 +15920,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[688] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15ac1,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 5370031104UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -15943,18 +15943,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[689] = {
 	.class_hid = BNXT_ULP_CLASS_HID_12cc3,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 5371071488UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -15967,17 +15967,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[690] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13923,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 5371079680UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -15990,18 +15990,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[691] = {
 	.class_hid = BNXT_ULP_CLASS_HID_168e3,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 5372120064UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -16014,18 +16014,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[692] = {
 	.class_hid = BNXT_ULP_CLASS_HID_164a9,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 5372128256UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -16038,19 +16038,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[693] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11e29,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 5905845248UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -16063,17 +16063,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[694] = {
 	.class_hid = BNXT_ULP_CLASS_HID_115eb,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 5905853440UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -16086,18 +16086,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[695] = {
 	.class_hid = BNXT_ULP_CLASS_HID_145a3,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 5906893824UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -16110,18 +16110,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[696] = {
 	.class_hid = BNXT_ULP_CLASS_HID_151a3,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 5906902016UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -16134,19 +16134,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[697] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1382b,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 5907942400UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -16159,18 +16159,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[698] = {
 	.class_hid = BNXT_ULP_CLASS_HID_137e1,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 5907950592UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -16183,19 +16183,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[699] = {
 	.class_hid = BNXT_ULP_CLASS_HID_167a1,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 5908990976UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -16208,19 +16208,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[700] = {
 	.class_hid = BNXT_ULP_CLASS_HID_173a1,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 5908999168UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -16233,20 +16233,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[701] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11449,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 6442716160UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -16259,16 +16259,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[702] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1000b,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 6442724352UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -16281,17 +16281,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[703] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15069,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 6443764736UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -16304,17 +16304,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[704] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14c2b,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 6443772928UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -16327,18 +16327,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[705] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1367b,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 6444813312UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -16351,17 +16351,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[706] = {
 	.class_hid = BNXT_ULP_CLASS_HID_12239,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 6444821504UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -16374,18 +16374,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[707] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1721b,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 6445861888UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -16398,18 +16398,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[708] = {
 	.class_hid = BNXT_ULP_CLASS_HID_169d9,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 6445870080UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -16422,19 +16422,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[709] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1033b,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 6979587072UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -16447,17 +16447,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[710] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11f3b,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 6979595264UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -16470,18 +16470,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[711] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14f2b,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 6980635648UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -16494,18 +16494,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[712] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15b2b,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 6980643840UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -16518,19 +16518,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[713] = {
 	.class_hid = BNXT_ULP_CLASS_HID_12d39,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 6981684224UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -16543,18 +16543,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[714] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13939,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 6981692416UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -16567,19 +16567,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[715] = {
 	.class_hid = BNXT_ULP_CLASS_HID_168f9,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 6982732800UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -16592,19 +16592,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[716] = {
 	.class_hid = BNXT_ULP_CLASS_HID_164bb,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 6982740992UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -16617,20 +16617,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[717] = {
 	.class_hid = BNXT_ULP_CLASS_HID_119cb,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 7516457984UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -16643,17 +16643,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[718] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11589,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 7516466176UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -16666,18 +16666,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[719] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14549,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 7517506560UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -16690,18 +16690,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[720] = {
 	.class_hid = BNXT_ULP_CLASS_HID_151a9,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 7517514752UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -16714,19 +16714,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[721] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13bc9,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 7518555136UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -16739,18 +16739,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[722] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1378b,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 7518563328UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -16763,19 +16763,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[723] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1674b,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 7519603712UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -16788,19 +16788,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[724] = {
 	.class_hid = BNXT_ULP_CLASS_HID_173ab,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 7519611904UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -16813,20 +16813,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[725] = {
 	.class_hid = BNXT_ULP_CLASS_HID_114a9,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 8053328896UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -16839,18 +16839,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[726] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1006b,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 8053337088UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -16863,19 +16863,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[727] = {
 	.class_hid = BNXT_ULP_CLASS_HID_150a9,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 8054377472UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -16888,19 +16888,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[728] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14c6b,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 8054385664UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -16913,20 +16913,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[729] = {
 	.class_hid = BNXT_ULP_CLASS_HID_136ab,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 8055426048UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -16939,19 +16939,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[730] = {
 	.class_hid = BNXT_ULP_CLASS_HID_12269,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 8055434240UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -16964,20 +16964,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[731] = {
 	.class_hid = BNXT_ULP_CLASS_HID_172ab,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 8056474624UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -16990,20 +16990,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[732] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16e69,
 	.class_tid = 2,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 20,
 	.flow_sig_id = 8056482816UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -17016,21 +17016,21 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT }
 	},
 	[733] = {
 	.class_hid = BNXT_ULP_CLASS_HID_402d2,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 66304UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -17043,14 +17043,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI }
 	},
 	[734] = {
 	.class_hid = BNXT_ULP_CLASS_HID_412ee,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 68352UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -17063,15 +17063,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI }
 	},
 	[735] = {
 	.class_hid = BNXT_ULP_CLASS_HID_512a2,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 328448UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -17084,15 +17084,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC }
 	},
 	[736] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50dd8,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 330496UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -17105,16 +17105,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC }
 	},
 	[737] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48aea,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 590592UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -17127,15 +17127,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC }
 	},
 	[738] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48500,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 592640UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -17148,16 +17148,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC }
 	},
 	[739] = {
 	.class_hid = BNXT_ULP_CLASS_HID_585d4,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 852736UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -17170,16 +17170,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC }
 	},
 	[740] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59590,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 854784UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -17192,17 +17192,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC }
 	},
 	[741] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41936,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 536937216UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -17215,15 +17215,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[742] = {
 	.class_hid = BNXT_ULP_CLASS_HID_409ac,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 536939264UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -17236,16 +17236,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[743] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50860,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 537199360UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -17258,16 +17258,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[744] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5183c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 537201408UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -17280,17 +17280,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[745] = {
 	.class_hid = BNXT_ULP_CLASS_HID_481a8,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 537461504UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -17303,16 +17303,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[746] = {
 	.class_hid = BNXT_ULP_CLASS_HID_49064,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 537463552UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -17325,17 +17325,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[747] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59038,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 537723648UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -17348,17 +17348,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[748] = {
 	.class_hid = BNXT_ULP_CLASS_HID_58376,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 537725696UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -17371,18 +17371,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[749] = {
 	.class_hid = BNXT_ULP_CLASS_HID_414a0,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 1073808128UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -17395,15 +17395,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[750] = {
 	.class_hid = BNXT_ULP_CLASS_HID_407ce,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 1073810176UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -17416,16 +17416,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[751] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50782,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 1074070272UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -17438,16 +17438,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[752] = {
 	.class_hid = BNXT_ULP_CLASS_HID_517ae,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 1074072320UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -17460,17 +17460,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[753] = {
 	.class_hid = BNXT_ULP_CLASS_HID_49f68,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 1074332416UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -17483,16 +17483,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[754] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48f86,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 1074334464UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -17505,17 +17505,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[755] = {
 	.class_hid = BNXT_ULP_CLASS_HID_58faa,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 1074594560UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -17528,17 +17528,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[756] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59e66,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 1074596608UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -17551,18 +17551,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[757] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40266,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 1610679040UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -17575,16 +17575,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[758] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41222,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 1610681088UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -17597,17 +17597,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[759] = {
 	.class_hid = BNXT_ULP_CLASS_HID_512e6,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 1610941184UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -17620,17 +17620,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[760] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50d6c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 1610943232UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -17643,18 +17643,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[761] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48a2e,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 1611203328UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -17667,17 +17667,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[762] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48564,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 1611205376UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -17690,18 +17690,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[763] = {
 	.class_hid = BNXT_ULP_CLASS_HID_58568,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 1611465472UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -17714,18 +17714,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[764] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59524,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 1611467520UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -17738,19 +17738,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[765] = {
 	.class_hid = BNXT_ULP_CLASS_HID_419d8,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 2147549952UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -17763,15 +17763,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT }
 	},
 	[766] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4087e,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 2147552000UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -17784,16 +17784,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT }
 	},
 	[767] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5080a,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 2147812096UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -17806,16 +17806,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT }
 	},
 	[768] = {
 	.class_hid = BNXT_ULP_CLASS_HID_518ce,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 2147814144UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -17828,17 +17828,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT }
 	},
 	[769] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4807a,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 2148074240UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -17851,16 +17851,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT }
 	},
 	[770] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4900e,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 2148076288UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -17873,17 +17873,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT }
 	},
 	[771] = {
 	.class_hid = BNXT_ULP_CLASS_HID_590ca,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 2148336384UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -17896,17 +17896,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT }
 	},
 	[772] = {
 	.class_hid = BNXT_ULP_CLASS_HID_58378,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 2148338432UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -17919,18 +17919,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT }
 	},
 	[773] = {
 	.class_hid = BNXT_ULP_CLASS_HID_414be,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 2684420864UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -17943,16 +17943,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT }
 	},
 	[774] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4073c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 2684422912UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -17965,17 +17965,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT }
 	},
 	[775] = {
 	.class_hid = BNXT_ULP_CLASS_HID_507e8,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 2684683008UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -17988,17 +17988,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT }
 	},
 	[776] = {
 	.class_hid = BNXT_ULP_CLASS_HID_517ac,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 2684685056UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -18011,18 +18011,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT }
 	},
 	[777] = {
 	.class_hid = BNXT_ULP_CLASS_HID_49f7e,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 2684945152UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -18035,17 +18035,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT }
 	},
 	[778] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48fec,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 2684947200UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -18058,18 +18058,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT }
 	},
 	[779] = {
 	.class_hid = BNXT_ULP_CLASS_HID_58fa8,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 2685207296UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -18082,18 +18082,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT }
 	},
 	[780] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59e7c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 2685209344UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -18106,19 +18106,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT }
 	},
 	[781] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40208,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 3221291776UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -18131,16 +18131,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT }
 	},
 	[782] = {
 	.class_hid = BNXT_ULP_CLASS_HID_412cc,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 3221293824UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -18153,17 +18153,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT }
 	},
 	[783] = {
 	.class_hid = BNXT_ULP_CLASS_HID_51288,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 3221553920UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -18176,17 +18176,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT }
 	},
 	[784] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50d2e,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 3221555968UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -18199,18 +18199,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT }
 	},
 	[785] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48ac8,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 3221816064UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -18223,17 +18223,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT }
 	},
 	[786] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4856e,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 3221818112UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -18246,18 +18246,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT }
 	},
 	[787] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5852a,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 3222078208UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -18270,18 +18270,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT }
 	},
 	[788] = {
 	.class_hid = BNXT_ULP_CLASS_HID_595ce,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 3222080256UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -18294,19 +18294,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT }
 	},
 	[789] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4196c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 3758162688UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -18319,17 +18319,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT }
 	},
 	[790] = {
 	.class_hid = BNXT_ULP_CLASS_HID_409aa,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 3758164736UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -18342,18 +18342,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT }
 	},
 	[791] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5086e,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 3758424832UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -18366,18 +18366,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT }
 	},
 	[792] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5182a,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 3758426880UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -18390,19 +18390,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT }
 	},
 	[793] = {
 	.class_hid = BNXT_ULP_CLASS_HID_481ae,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 3758686976UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -18415,18 +18415,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT }
 	},
 	[794] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4906a,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 3758689024UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -18439,19 +18439,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT }
 	},
 	[795] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5902e,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 3758949120UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -18464,19 +18464,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT }
 	},
 	[796] = {
 	.class_hid = BNXT_ULP_CLASS_HID_580ac,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 3758951168UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -18489,20 +18489,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT }
 	},
 	[797] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40766,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 4295033600UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -18515,15 +18515,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[798] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41726,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 4295035648UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -18536,16 +18536,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[799] = {
 	.class_hid = BNXT_ULP_CLASS_HID_517f6,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 4295295744UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -18558,16 +18558,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[800] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5066c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 4295297792UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -18580,17 +18580,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[801] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48f3e,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 4295557888UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -18603,16 +18603,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[802] = {
 	.class_hid = BNXT_ULP_CLASS_HID_49ffe,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 4295559936UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -18625,17 +18625,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[803] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59f8e,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 4295820032UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -18648,17 +18648,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[804] = {
 	.class_hid = BNXT_ULP_CLASS_HID_58e24,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 4295822080UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -18671,18 +18671,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[805] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4126e,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 4831904512UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -18695,16 +18695,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[806] = {
 	.class_hid = BNXT_ULP_CLASS_HID_402e4,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 4831906560UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -18717,17 +18717,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[807] = {
 	.class_hid = BNXT_ULP_CLASS_HID_502b4,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 4832166656UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -18740,17 +18740,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[808] = {
 	.class_hid = BNXT_ULP_CLASS_HID_51d74,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 4832168704UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -18763,18 +18763,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[809] = {
 	.class_hid = BNXT_ULP_CLASS_HID_49a26,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 4832428800UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -18787,17 +18787,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[810] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48abc,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 4832430848UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -18810,18 +18810,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[811] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5956c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 4832690944UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -18834,18 +18834,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[812] = {
 	.class_hid = BNXT_ULP_CLASS_HID_585ee,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 4832692992UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -18858,19 +18858,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[813] = {
 	.class_hid = BNXT_ULP_CLASS_HID_409e4,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 5368775424UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -18883,16 +18883,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[814] = {
 	.class_hid = BNXT_ULP_CLASS_HID_419a4,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 5368777472UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -18905,17 +18905,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[815] = {
 	.class_hid = BNXT_ULP_CLASS_HID_51844,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 5369037568UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -18928,17 +18928,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[816] = {
 	.class_hid = BNXT_ULP_CLASS_HID_508e6,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 5369039616UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -18951,18 +18951,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[817] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4918c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 5369299712UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -18975,17 +18975,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[818] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4802e,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 5369301760UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -18998,18 +18998,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[819] = {
 	.class_hid = BNXT_ULP_CLASS_HID_580ee,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 5369561856UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -19022,18 +19022,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[820] = {
 	.class_hid = BNXT_ULP_CLASS_HID_590ae,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 5369563904UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -19046,19 +19046,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[821] = {
 	.class_hid = BNXT_ULP_CLASS_HID_404ae,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 5905646336UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -19071,17 +19071,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[822] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41766,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 5905648384UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -19094,18 +19094,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[823] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5172e,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 5905908480UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -19118,18 +19118,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[824] = {
 	.class_hid = BNXT_ULP_CLASS_HID_507a4,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 5905910528UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -19142,19 +19142,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[825] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48f66,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 5906170624UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -19167,18 +19167,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[826] = {
 	.class_hid = BNXT_ULP_CLASS_HID_49f2e,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 5906172672UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -19191,19 +19191,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[827] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59fe6,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 5906432768UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -19216,19 +19216,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[828] = {
 	.class_hid = BNXT_ULP_CLASS_HID_58e6c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 5906434816UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -19241,20 +19241,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[829] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4126c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 6442517248UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -19267,16 +19267,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[830] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4028e,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 6442519296UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -19289,17 +19289,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[831] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50d5e,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 6442779392UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -19312,17 +19312,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[832] = {
 	.class_hid = BNXT_ULP_CLASS_HID_51d1e,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 6442781440UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -19335,18 +19335,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[833] = {
 	.class_hid = BNXT_ULP_CLASS_HID_49a2c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 6443041536UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -19359,17 +19359,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[834] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4954e,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 6443043584UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -19382,18 +19382,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[835] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5951e,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 6443303680UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -19406,18 +19406,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[836] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5858c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 6443305728UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -19430,19 +19430,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[837] = {
 	.class_hid = BNXT_ULP_CLASS_HID_409fe,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 6979388160UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -19455,17 +19455,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[838] = {
 	.class_hid = BNXT_ULP_CLASS_HID_419ee,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 6979390208UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -19478,18 +19478,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[839] = {
 	.class_hid = BNXT_ULP_CLASS_HID_519ae,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 6979650304UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -19502,18 +19502,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[840] = {
 	.class_hid = BNXT_ULP_CLASS_HID_508fc,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 6979652352UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -19526,19 +19526,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[841] = {
 	.class_hid = BNXT_ULP_CLASS_HID_491ee,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 6979912448UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -19551,18 +19551,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[842] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4802c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 6979914496UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -19575,19 +19575,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[843] = {
 	.class_hid = BNXT_ULP_CLASS_HID_580fc,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 6980174592UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -19600,19 +19600,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[844] = {
 	.class_hid = BNXT_ULP_CLASS_HID_590bc,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 6980176640UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -19625,20 +19625,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[845] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4074c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 7516259072UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -19651,17 +19651,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[846] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4170c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 7516261120UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -19674,18 +19674,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[847] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5172c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 7516521216UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -19698,18 +19698,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[848] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5064e,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 7516523264UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -19722,19 +19722,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[849] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48f0c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 7516783360UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -19747,18 +19747,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[850] = {
 	.class_hid = BNXT_ULP_CLASS_HID_49fcc,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 7516785408UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -19771,19 +19771,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[851] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59fec,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 7517045504UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -19796,19 +19796,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[852] = {
 	.class_hid = BNXT_ULP_CLASS_HID_58e0e,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 7517047552UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -19821,20 +19821,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[853] = {
 	.class_hid = BNXT_ULP_CLASS_HID_413ac,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 8053129984UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -19847,18 +19847,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[854] = {
 	.class_hid = BNXT_ULP_CLASS_HID_402ee,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 8053132032UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -19871,19 +19871,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[855] = {
 	.class_hid = BNXT_ULP_CLASS_HID_502ae,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 8053392128UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -19896,19 +19896,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[856] = {
 	.class_hid = BNXT_ULP_CLASS_HID_512ae,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 8053394176UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -19921,20 +19921,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[857] = {
 	.class_hid = BNXT_ULP_CLASS_HID_49a6c,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 8053654272UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -19947,19 +19947,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[858] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48aae,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 8053656320UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -19972,20 +19972,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[859] = {
 	.class_hid = BNXT_ULP_CLASS_HID_58aae,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 8053916416UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -19998,20 +19998,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[860] = {
 	.class_hid = BNXT_ULP_CLASS_HID_585ec,
 	.class_tid = 2,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 21,
 	.flow_sig_id = 8053918464UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -20024,21 +20024,21 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT }
 	},
 	[861] = {
 	.class_hid = BNXT_ULP_CLASS_HID_104ae,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 265216UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -20051,14 +20051,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI }
 	},
 	[862] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1108e,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 273408UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -20071,15 +20071,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI }
 	},
 	[863] = {
 	.class_hid = BNXT_ULP_CLASS_HID_140b2,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 1313792UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -20092,15 +20092,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC }
 	},
 	[864] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15c92,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 1321984UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -20113,16 +20113,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC }
 	},
 	[865] = {
 	.class_hid = BNXT_ULP_CLASS_HID_126a0,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 2362368UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -20135,15 +20135,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC }
 	},
 	[866] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13280,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 2370560UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -20156,16 +20156,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC }
 	},
 	[867] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16d44,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 3410944UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -20178,16 +20178,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC }
 	},
 	[868] = {
 	.class_hid = BNXT_ULP_CLASS_HID_17ea4,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 3419136UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -20200,17 +20200,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC }
 	},
 	[869] = {
 	.class_hid = BNXT_ULP_CLASS_HID_113a4,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 2147748864UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -20223,15 +20223,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[870] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10e66,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 2147757056UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -20244,16 +20244,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[871] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15e40,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 2148797440UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -20266,16 +20266,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[872] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14a02,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 2148805632UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -20288,17 +20288,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[873] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13db6,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 2149846016UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -20311,16 +20311,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[874] = {
 	.class_hid = BNXT_ULP_CLASS_HID_12870,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 2149854208UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -20333,17 +20333,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[875] = {
 	.class_hid = BNXT_ULP_CLASS_HID_17852,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 2150894592UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -20356,17 +20356,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[876] = {
 	.class_hid = BNXT_ULP_CLASS_HID_17414,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 2150902784UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -20379,18 +20379,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[877] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11978,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 4295232512UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -20403,15 +20403,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[878] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1153a,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 4295240704UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -20424,16 +20424,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[879] = {
 	.class_hid = BNXT_ULP_CLASS_HID_145fa,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 4296281088UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -20446,16 +20446,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[880] = {
 	.class_hid = BNXT_ULP_CLASS_HID_151da,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 4296289280UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -20468,17 +20468,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[881] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13b0a,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 4297329664UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -20491,16 +20491,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[882] = {
 	.class_hid = BNXT_ULP_CLASS_HID_137c8,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 4297337856UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -20513,17 +20513,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[883] = {
 	.class_hid = BNXT_ULP_CLASS_HID_167f0,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 4298378240UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -20536,17 +20536,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[884] = {
 	.class_hid = BNXT_ULP_CLASS_HID_173d0,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 4298386432UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -20559,18 +20559,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[885] = {
 	.class_hid = BNXT_ULP_CLASS_HID_114d0,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 6442716160UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -20583,16 +20583,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[886] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10092,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 6442724352UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -20605,17 +20605,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[887] = {
 	.class_hid = BNXT_ULP_CLASS_HID_150f0,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 6443764736UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -20628,17 +20628,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[888] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14cb2,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 6443772928UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -20651,18 +20651,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[889] = {
 	.class_hid = BNXT_ULP_CLASS_HID_136e2,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 6444813312UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -20675,17 +20675,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[890] = {
 	.class_hid = BNXT_ULP_CLASS_HID_122a0,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 6444821504UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -20698,18 +20698,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[891] = {
 	.class_hid = BNXT_ULP_CLASS_HID_17282,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 6445861888UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -20722,18 +20722,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[892] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16940,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 6445870080UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -20746,19 +20746,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[893] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11b90,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 8590199808UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -20771,15 +20771,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT }
 	},
 	[894] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11654,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 8590208000UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -20792,16 +20792,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT }
 	},
 	[895] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14618,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 8591248384UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -20814,16 +20814,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT }
 	},
 	[896] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15278,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 8591256576UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -20836,17 +20836,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT }
 	},
 	[897] = {
 	.class_hid = BNXT_ULP_CLASS_HID_12404,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 8592296960UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -20859,16 +20859,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT }
 	},
 	[898] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13064,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 8592305152UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -20881,17 +20881,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT }
 	},
 	[899] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16028,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 8593345536UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -20904,17 +20904,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT }
 	},
 	[900] = {
 	.class_hid = BNXT_ULP_CLASS_HID_17c08,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 8593353728UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -20927,18 +20927,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT }
 	},
 	[901] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11100,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 10737683456UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -20951,16 +20951,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT }
 	},
 	[902] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10dc4,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 10737691648UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -20973,17 +20973,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT }
 	},
 	[903] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15d24,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 10738732032UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -20996,17 +20996,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT }
 	},
 	[904] = {
 	.class_hid = BNXT_ULP_CLASS_HID_149d0,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 10738740224UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -21019,18 +21019,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT }
 	},
 	[905] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13314,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 10739780608UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -21043,17 +21043,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT }
 	},
 	[906] = {
 	.class_hid = BNXT_ULP_CLASS_HID_12fd4,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 10739788800UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -21066,18 +21066,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT }
 	},
 	[907] = {
 	.class_hid = BNXT_ULP_CLASS_HID_17f20,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 10740829184UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -21090,18 +21090,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT }
 	},
 	[908] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16be0,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 10740837376UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -21114,19 +21114,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT }
 	},
 	[909] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11cd8,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 12885167104UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -21139,16 +21139,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT }
 	},
 	[910] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10880,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 12885175296UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -21161,17 +21161,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT }
 	},
 	[911] = {
 	.class_hid = BNXT_ULP_CLASS_HID_158e0,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 12886215680UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -21184,17 +21184,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT }
 	},
 	[912] = {
 	.class_hid = BNXT_ULP_CLASS_HID_154a0,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 12886223872UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -21207,18 +21207,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT }
 	},
 	[913] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13ed0,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 12887264256UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -21231,17 +21231,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT }
 	},
 	[914] = {
 	.class_hid = BNXT_ULP_CLASS_HID_12a90,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 12887272448UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -21254,18 +21254,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT }
 	},
 	[915] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16550,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 12888312832UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -21278,18 +21278,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT }
 	},
 	[916] = {
 	.class_hid = BNXT_ULP_CLASS_HID_176b0,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 12888321024UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -21302,19 +21302,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT }
 	},
 	[917] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10bb0,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 15032650752UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -21327,17 +21327,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT }
 	},
 	[918] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10670,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 15032658944UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -21350,18 +21350,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT }
 	},
 	[919] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15650,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 15033699328UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -21374,18 +21374,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT }
 	},
 	[920] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14210,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 15033707520UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -21398,19 +21398,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT }
 	},
 	[921] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13440,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 15034747904UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -21423,18 +21423,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT }
 	},
 	[922] = {
 	.class_hid = BNXT_ULP_CLASS_HID_12000,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 15034756096UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -21447,19 +21447,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT }
 	},
 	[923] = {
 	.class_hid = BNXT_ULP_CLASS_HID_17060,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 15035796480UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -21472,19 +21472,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT }
 	},
 	[924] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16c20,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 15035804672UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -21497,20 +21497,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT }
 	},
 	[925] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11511,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 17180134400UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -21523,15 +21523,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[926] = {
 	.class_hid = BNXT_ULP_CLASS_HID_101d3,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 17180142592UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -21544,16 +21544,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[927] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15135,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 17181182976UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -21566,16 +21566,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[928] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14df7,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 17181191168UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -21588,17 +21588,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[929] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13723,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 17182231552UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -21611,16 +21611,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[930] = {
 	.class_hid = BNXT_ULP_CLASS_HID_123e5,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 17182239744UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -21633,17 +21633,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[931] = {
 	.class_hid = BNXT_ULP_CLASS_HID_173c7,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 17183280128UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -21656,17 +21656,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[932] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16f89,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 17183288320UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -21679,18 +21679,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[933] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10081,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 19327618048UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -21703,16 +21703,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[934] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11ce1,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 19327626240UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -21725,17 +21725,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[935] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14ca5,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 19328666624UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -21748,17 +21748,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[936] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15885,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 19328674816UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -21771,18 +21771,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[937] = {
 	.class_hid = BNXT_ULP_CLASS_HID_12293,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 19329715200UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -21795,17 +21795,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[938] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13ef3,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 19329723392UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -21818,18 +21818,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[939] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16eb7,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 19330763776UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -21842,18 +21842,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[940] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16561,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 19330771968UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -21866,19 +21866,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[941] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10e59,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 21475101696UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -21891,16 +21891,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[942] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11bb9,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 21475109888UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -21913,17 +21913,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[943] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14a61,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 21476150272UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -21936,17 +21936,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[944] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14623,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 21476158464UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -21959,18 +21959,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[945] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1286b,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 21477198848UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -21983,17 +21983,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[946] = {
 	.class_hid = BNXT_ULP_CLASS_HID_12411,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 21477207040UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -22006,18 +22006,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[947] = {
 	.class_hid = BNXT_ULP_CLASS_HID_17473,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 21478247424UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -22030,18 +22030,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[948] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16031,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 21478255616UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -22054,19 +22054,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[949] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10531,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 23622585344UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -22079,17 +22079,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[950] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11111,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 23622593536UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -22102,18 +22102,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[951] = {
 	.class_hid = BNXT_ULP_CLASS_HID_141d1,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 23623633920UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -22126,18 +22126,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[952] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15d31,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 23623642112UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -22150,19 +22150,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[953] = {
 	.class_hid = BNXT_ULP_CLASS_HID_127c3,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 23624682496UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -22175,18 +22175,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[954] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13323,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 23624690688UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -22199,19 +22199,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[955] = {
 	.class_hid = BNXT_ULP_CLASS_HID_163e3,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 23625731072UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -22224,19 +22224,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[956] = {
 	.class_hid = BNXT_ULP_CLASS_HID_17fc3,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 23625739264UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -22249,20 +22249,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[957] = {
 	.class_hid = BNXT_ULP_CLASS_HID_108f5,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 25770068992UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -22275,16 +22275,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[958] = {
 	.class_hid = BNXT_ULP_CLASS_HID_104b9,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 25770077184UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -22297,17 +22297,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[959] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15499,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 25771117568UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -22320,17 +22320,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[960] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1435d,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 25771125760UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -22343,18 +22343,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[961] = {
 	.class_hid = BNXT_ULP_CLASS_HID_12a89,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 25772166144UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -22367,17 +22367,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[962] = {
 	.class_hid = BNXT_ULP_CLASS_HID_12149,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 25772174336UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -22390,18 +22390,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[963] = {
 	.class_hid = BNXT_ULP_CLASS_HID_176ad,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 25773214720UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -22414,18 +22414,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[964] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16d6d,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 25773222912UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -22438,19 +22438,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[965] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10665,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 27917552640UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -22463,17 +22463,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[966] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11245,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 27917560832UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -22486,18 +22486,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[967] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14271,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 27918601216UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -22510,18 +22510,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[968] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15e51,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 27918609408UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -22534,19 +22534,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[969] = {
 	.class_hid = BNXT_ULP_CLASS_HID_12061,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 27919649792UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -22559,18 +22559,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[970] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13c41,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 27919657984UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -22583,19 +22583,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[971] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16c05,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 27920698368UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -22608,19 +22608,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[972] = {
 	.class_hid = BNXT_ULP_CLASS_HID_17865,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 27920706560UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -22633,20 +22633,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[973] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10d21,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 30065036288UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -22659,17 +22659,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[974] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11901,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 30065044480UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -22682,18 +22682,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[975] = {
 	.class_hid = BNXT_ULP_CLASS_HID_149c1,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 30066084864UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -22706,18 +22706,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[976] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14589,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 30066093056UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -22730,19 +22730,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[977] = {
 	.class_hid = BNXT_ULP_CLASS_HID_12f31,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 30067133440UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -22755,18 +22755,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[978] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13b11,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 30067141632UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -22779,19 +22779,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[979] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16bd9,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 30068182016UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -22804,19 +22804,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[980] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16799,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 30068190208UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -22829,20 +22829,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[981] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11831,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 32212519936UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -22855,18 +22855,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[982] = {
 	.class_hid = BNXT_ULP_CLASS_HID_114f1,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 32212528128UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -22879,19 +22879,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[983] = {
 	.class_hid = BNXT_ULP_CLASS_HID_144b1,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 32213568512UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -22904,19 +22904,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[984] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15091,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 32213576704UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -22929,20 +22929,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[985] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13ac1,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 32214617088UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -22955,19 +22955,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[986] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13681,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 32214625280UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -22980,20 +22980,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[987] = {
 	.class_hid = BNXT_ULP_CLASS_HID_166b1,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 32215665664UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -23006,20 +23006,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[988] = {
 	.class_hid = BNXT_ULP_CLASS_HID_17291,
 	.class_tid = 2,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 22,
 	.flow_sig_id = 32215673856UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -23032,21 +23032,21 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT }
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT }
 	},
 	[989] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4007d,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 66304UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -23059,14 +23059,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI }
 	},
 	[990] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41041,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 68352UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -23079,15 +23079,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI }
 	},
 	[991] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5100d,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 328448UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -23100,15 +23100,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC }
 	},
 	[992] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50f77,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 330496UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -23121,16 +23121,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC }
 	},
 	[993] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48845,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 590592UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -23143,15 +23143,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC }
 	},
 	[994] = {
 	.class_hid = BNXT_ULP_CLASS_HID_487af,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 592640UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -23164,16 +23164,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC }
 	},
 	[995] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5877b,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 852736UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -23186,16 +23186,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC }
 	},
 	[996] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5973f,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 854784UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -23208,17 +23208,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC }
 	},
 	[997] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41c31,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 134284032UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -23231,15 +23231,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[998] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40b1b,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 134286080UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -23252,16 +23252,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[999] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50b67,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 134546176UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -23274,16 +23274,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[1000] = {
 	.class_hid = BNXT_ULP_CLASS_HID_51b2b,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 134548224UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -23296,17 +23296,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[1001] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4831f,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 134808320UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -23319,16 +23319,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[1002] = {
 	.class_hid = BNXT_ULP_CLASS_HID_49363,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 134810368UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -23341,17 +23341,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[1003] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5932f,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 135070464UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -23364,17 +23364,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[1004] = {
 	.class_hid = BNXT_ULP_CLASS_HID_58211,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 135072512UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -23387,18 +23387,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[1005] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4161b,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 268501760UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -23411,15 +23411,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[1006] = {
 	.class_hid = BNXT_ULP_CLASS_HID_405bd,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 268503808UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -23432,16 +23432,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[1007] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50589,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 268763904UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -23454,16 +23454,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[1008] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5150d,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 268765952UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -23476,17 +23476,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[1009] = {
 	.class_hid = BNXT_ULP_CLASS_HID_49e23,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 269026048UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -23499,16 +23499,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[1010] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48d85,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 269028096UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -23521,17 +23521,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[1011] = {
 	.class_hid = BNXT_ULP_CLASS_HID_58d11,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 269288192UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -23544,17 +23544,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[1012] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59d15,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 269290240UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -23567,18 +23567,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[1013] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4012d,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 402719488UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -23591,16 +23591,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[1014] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41131,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 402721536UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -23613,17 +23613,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[1015] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5113d,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 402981632UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -23636,17 +23636,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[1016] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50027,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 402983680UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -23659,18 +23659,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[1017] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48935,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 403243776UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -23683,17 +23683,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[1018] = {
 	.class_hid = BNXT_ULP_CLASS_HID_49939,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 403245824UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -23706,18 +23706,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[1019] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59905,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 403505920UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -23730,18 +23730,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[1020] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5882f,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 403507968UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -23754,19 +23754,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[1021] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41b99,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 536937216UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -23779,15 +23779,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1022] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40b03,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 536939264UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -23800,16 +23800,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1023] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50acf,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 537199360UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -23822,16 +23822,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1024] = {
 	.class_hid = BNXT_ULP_CLASS_HID_51a93,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 537201408UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -23844,17 +23844,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1025] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48307,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 537461504UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -23867,16 +23867,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1026] = {
 	.class_hid = BNXT_ULP_CLASS_HID_492cb,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 537463552UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -23889,17 +23889,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1027] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59297,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 537723648UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -23912,17 +23912,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1028] = {
 	.class_hid = BNXT_ULP_CLASS_HID_581d9,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 537725696UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -23935,18 +23935,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1029] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41653,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 671154944UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -23959,16 +23959,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1030] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40655,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 671156992UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -23981,17 +23981,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1031] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50601,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 671417088UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -24004,17 +24004,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1032] = {
 	.class_hid = BNXT_ULP_CLASS_HID_51545,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 671419136UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -24027,18 +24027,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1033] = {
 	.class_hid = BNXT_ULP_CLASS_HID_49e1b,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 671679232UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -24051,17 +24051,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1034] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48e1d,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 671681280UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -24074,18 +24074,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1035] = {
 	.class_hid = BNXT_ULP_CLASS_HID_58d49,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 671941376UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -24098,18 +24098,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1036] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59d0d,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 671943424UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -24122,19 +24122,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1037] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40115,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 805372672UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -24147,16 +24147,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1038] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41099,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 805374720UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -24169,17 +24169,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1039] = {
 	.class_hid = BNXT_ULP_CLASS_HID_51085,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 805634816UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -24192,17 +24192,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1040] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5000f,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 805636864UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -24215,18 +24215,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1041] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4889d,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 805896960UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -24239,17 +24239,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1042] = {
 	.class_hid = BNXT_ULP_CLASS_HID_49881,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 805899008UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -24262,18 +24262,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1043] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5980d,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 806159104UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -24286,18 +24286,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1044] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59797,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 806161152UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -24310,19 +24310,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1045] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41c09,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 939590400UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -24335,17 +24335,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1046] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40c13,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 939592448UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -24358,18 +24358,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1047] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50b1f,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 939852544UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -24382,18 +24382,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1048] = {
 	.class_hid = BNXT_ULP_CLASS_HID_51b03,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 939854592UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -24406,19 +24406,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1049] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48417,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 940114688UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -24431,18 +24431,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1050] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4931b,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 940116736UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -24455,19 +24455,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1051] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59307,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 940376832UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -24480,19 +24480,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1052] = {
 	.class_hid = BNXT_ULP_CLASS_HID_58309,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 940378880UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -24505,20 +24505,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1053] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4160f,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1073808128UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -24531,15 +24531,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1054] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40561,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1073810176UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -24552,16 +24552,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1055] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5052d,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1074070272UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -24574,16 +24574,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1056] = {
 	.class_hid = BNXT_ULP_CLASS_HID_51501,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1074072320UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -24596,17 +24596,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1057] = {
 	.class_hid = BNXT_ULP_CLASS_HID_49dc7,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1074332416UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -24619,16 +24619,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1058] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48d29,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1074334464UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -24641,17 +24641,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1059] = {
 	.class_hid = BNXT_ULP_CLASS_HID_58d05,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1074594560UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -24664,17 +24664,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1060] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59cc9,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1074596608UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -24687,18 +24687,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1061] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40161,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1208025856UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -24711,16 +24711,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1062] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41125,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1208027904UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -24733,17 +24733,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1063] = {
 	.class_hid = BNXT_ULP_CLASS_HID_51061,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1208288000UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -24756,17 +24756,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1064] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5004b,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1208290048UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -24779,18 +24779,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1065] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48929,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1208550144UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -24803,17 +24803,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1066] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4986d,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1208552192UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -24826,18 +24826,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1067] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59829,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1208812288UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -24850,18 +24850,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1068] = {
 	.class_hid = BNXT_ULP_CLASS_HID_58823,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1208814336UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -24874,19 +24874,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1069] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41ba5,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1342243584UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -24899,16 +24899,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1070] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40b0f,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1342245632UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -24921,17 +24921,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1071] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50b0b,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1342505728UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -24944,17 +24944,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1072] = {
 	.class_hid = BNXT_ULP_CLASS_HID_51a8f,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1342507776UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -24967,18 +24967,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1073] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48303,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1342767872UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -24991,17 +24991,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1074] = {
 	.class_hid = BNXT_ULP_CLASS_HID_49307,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1342769920UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -25014,18 +25014,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1075] = {
 	.class_hid = BNXT_ULP_CLASS_HID_592a3,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1343030016UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -25038,18 +25038,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1076] = {
 	.class_hid = BNXT_ULP_CLASS_HID_58205,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1343032064UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -25062,19 +25062,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1077] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4172f,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1476461312UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -25087,17 +25087,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1078] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40621,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1476463360UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -25110,18 +25110,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1079] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5062d,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1476723456UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -25134,18 +25134,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1080] = {
 	.class_hid = BNXT_ULP_CLASS_HID_51621,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1476725504UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -25158,19 +25158,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1081] = {
 	.class_hid = BNXT_ULP_CLASS_HID_49f07,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1476985600UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -25183,18 +25183,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1082] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48e29,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1476987648UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -25207,19 +25207,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1083] = {
 	.class_hid = BNXT_ULP_CLASS_HID_58e25,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1477247744UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -25232,19 +25232,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1084] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59d29,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1477249792UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -25257,20 +25257,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1085] = {
 	.class_hid = BNXT_ULP_CLASS_HID_400c9,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1610679040UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -25283,16 +25283,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1086] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4108d,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1610681088UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -25305,17 +25305,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1087] = {
 	.class_hid = BNXT_ULP_CLASS_HID_51049,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1610941184UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -25328,17 +25328,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1088] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50fc3,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1610943232UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -25351,18 +25351,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1089] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48881,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1611203328UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -25375,17 +25375,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1090] = {
 	.class_hid = BNXT_ULP_CLASS_HID_487cb,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1611205376UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -25398,18 +25398,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1091] = {
 	.class_hid = BNXT_ULP_CLASS_HID_587c7,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1611465472UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -25422,18 +25422,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1092] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5978b,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1611467520UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -25446,19 +25446,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1093] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41c4d,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1744896768UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -25471,17 +25471,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1094] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40b47,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1744898816UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -25494,18 +25494,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1095] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50b03,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1745158912UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -25518,18 +25518,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1096] = {
 	.class_hid = BNXT_ULP_CLASS_HID_51b47,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1745160960UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -25542,19 +25542,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1097] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4834b,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1745421056UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -25567,18 +25567,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1098] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4930f,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1745423104UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -25591,19 +25591,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1099] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5934b,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1745683200UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -25616,19 +25616,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1100] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5824d,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1745685248UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -25641,20 +25641,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1101] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41687,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1879114496UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -25667,17 +25667,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1102] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40609,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1879116544UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -25690,18 +25690,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1103] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50585,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1879376640UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -25714,18 +25714,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1104] = {
 	.class_hid = BNXT_ULP_CLASS_HID_51589,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1879378688UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -25738,19 +25738,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1105] = {
 	.class_hid = BNXT_ULP_CLASS_HID_49e0f,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1879638784UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -25763,18 +25763,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1106] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48d81,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1879640832UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -25787,19 +25787,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1107] = {
 	.class_hid = BNXT_ULP_CLASS_HID_58d8d,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1879900928UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -25812,19 +25812,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1108] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59d01,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 1879902976UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -25837,20 +25837,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1109] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40109,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 2013332224UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -25863,18 +25863,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1110] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4110d,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 2013334272UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -25887,19 +25887,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1111] = {
 	.class_hid = BNXT_ULP_CLASS_HID_51109,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 2013594368UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -25912,19 +25912,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1112] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50003,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 2013596416UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -25937,20 +25937,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1113] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48901,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 2013856512UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -25963,19 +25963,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1114] = {
 	.class_hid = BNXT_ULP_CLASS_HID_49905,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 2013858560UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -25988,20 +25988,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1115] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59901,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 2014118656UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -26014,20 +26014,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1116] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5880b,
 	.class_tid = 2,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 23,
 	.flow_sig_id = 2014120704UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -26040,21 +26040,21 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT }
 	},
 	[1117] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10619,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 265216UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -26067,14 +26067,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI }
 	},
 	[1118] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11239,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 273408UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -26087,15 +26087,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI }
 	},
 	[1119] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14205,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 1313792UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -26108,15 +26108,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC }
 	},
 	[1120] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15e25,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 1321984UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -26129,16 +26129,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC }
 	},
 	[1121] = {
 	.class_hid = BNXT_ULP_CLASS_HID_12417,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 2362368UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -26151,15 +26151,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC }
 	},
 	[1122] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13037,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 2370560UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -26172,16 +26172,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC }
 	},
 	[1123] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16ff3,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 3410944UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -26194,16 +26194,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC }
 	},
 	[1124] = {
 	.class_hid = BNXT_ULP_CLASS_HID_17c13,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 3419136UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -26216,17 +26216,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC }
 	},
 	[1125] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1111d,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 537136128UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -26239,15 +26239,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[1126] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10cdb,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 537144320UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -26260,16 +26260,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[1127] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15d19,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 538184704UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -26282,16 +26282,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[1128] = {
 	.class_hid = BNXT_ULP_CLASS_HID_148c7,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 538192896UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -26304,17 +26304,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[1129] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13f0b,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 539233280UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -26327,16 +26327,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[1130] = {
 	.class_hid = BNXT_ULP_CLASS_HID_12ac9,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 539241472UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -26349,17 +26349,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[1131] = {
 	.class_hid = BNXT_ULP_CLASS_HID_17b17,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 540281856UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -26372,17 +26372,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[1132] = {
 	.class_hid = BNXT_ULP_CLASS_HID_176d5,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 540290048UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -26395,18 +26395,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR }
 	},
 	[1133] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10bab,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 1074007040UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -26419,15 +26419,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[1134] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10769,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 1074015232UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -26440,16 +26440,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[1135] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15787,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 1075055616UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -26462,16 +26462,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[1136] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14345,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 1075063808UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -26484,17 +26484,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[1137] = {
 	.class_hid = BNXT_ULP_CLASS_HID_12989,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 1076104192UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -26507,16 +26507,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[1138] = {
 	.class_hid = BNXT_ULP_CLASS_HID_12567,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 1076112384UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -26529,17 +26529,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[1139] = {
 	.class_hid = BNXT_ULP_CLASS_HID_17585,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 1077152768UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -26552,17 +26552,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[1140] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16143,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 1077160960UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -26575,18 +26575,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[1141] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1064d,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 1610877952UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -26599,16 +26599,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[1142] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1128d,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 1610886144UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -26621,17 +26621,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[1143] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14249,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 1611926528UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -26644,17 +26644,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[1144] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15e49,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 1611934720UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -26667,18 +26667,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[1145] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1244b,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 1612975104UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -26691,17 +26691,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[1146] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1304b,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 1612983296UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -26714,18 +26714,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[1147] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16047,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 1614023680UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -26738,18 +26738,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[1148] = {
 	.class_hid = BNXT_ULP_CLASS_HID_17c47,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 1614031872UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -26762,19 +26762,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR }
 	},
 	[1149] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11113,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 2147748864UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -26787,15 +26787,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1150] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10cd1,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 2147757056UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -26808,16 +26808,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1151] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15cf7,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 2148797440UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -26830,16 +26830,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1152] = {
 	.class_hid = BNXT_ULP_CLASS_HID_148b5,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 2148805632UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -26852,17 +26852,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1153] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13f01,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 2149846016UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -26875,16 +26875,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1154] = {
 	.class_hid = BNXT_ULP_CLASS_HID_12ac7,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 2149854208UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -26897,17 +26897,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1155] = {
 	.class_hid = BNXT_ULP_CLASS_HID_17ae5,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 2150894592UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -26920,17 +26920,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1156] = {
 	.class_hid = BNXT_ULP_CLASS_HID_176a3,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 2150902784UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -26943,18 +26943,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1157] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10bd5,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 2684619776UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -26967,16 +26967,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1158] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10793,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 2684627968UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -26989,17 +26989,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1159] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15791,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 2685668352UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -27012,17 +27012,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1160] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14357,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 2685676544UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -27035,18 +27035,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1161] = {
 	.class_hid = BNXT_ULP_CLASS_HID_129c3,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 2686716928UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -27059,17 +27059,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1162] = {
 	.class_hid = BNXT_ULP_CLASS_HID_12581,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 2686725120UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -27082,18 +27082,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1163] = {
 	.class_hid = BNXT_ULP_CLASS_HID_17587,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 2687765504UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -27106,18 +27106,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1164] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16145,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 2687773696UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -27130,19 +27130,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1165] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10643,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 3221490688UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -27155,16 +27155,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1166] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11263,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 3221498880UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -27177,17 +27177,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1167] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14227,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 3222539264UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -27200,17 +27200,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1168] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15e47,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 3222547456UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -27223,18 +27223,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1169] = {
 	.class_hid = BNXT_ULP_CLASS_HID_12421,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 3223587840UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -27247,17 +27247,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1170] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13041,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 3223596032UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -27270,18 +27270,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1171] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16005,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 3224636416UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -27294,18 +27294,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1172] = {
 	.class_hid = BNXT_ULP_CLASS_HID_17c25,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 3224644608UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -27318,19 +27318,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1173] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11147,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 3758361600UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -27343,17 +27343,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1174] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10d05,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 3758369792UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -27366,18 +27366,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1175] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15d43,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 3759410176UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -27390,18 +27390,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1176] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14901,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 3759418368UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -27414,19 +27414,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1177] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13f45,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 3760458752UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -27439,18 +27439,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1178] = {
 	.class_hid = BNXT_ULP_CLASS_HID_12b03,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 3760466944UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -27463,19 +27463,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1179] = {
 	.class_hid = BNXT_ULP_CLASS_HID_17b01,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 3761507328UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -27488,19 +27488,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1180] = {
 	.class_hid = BNXT_ULP_CLASS_HID_176c7,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 3761515520UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -27513,20 +27513,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1181] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11bcf,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 4295232512UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -27539,15 +27539,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1182] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1178d,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 4295240704UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -27560,16 +27560,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1183] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1474d,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 4296281088UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -27582,16 +27582,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1184] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1536d,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 4296289280UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -27604,17 +27604,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1185] = {
 	.class_hid = BNXT_ULP_CLASS_HID_139bd,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 4297329664UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -27627,16 +27627,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1186] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1357f,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 4297337856UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -27649,17 +27649,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1187] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16547,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 4298378240UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -27672,17 +27672,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1188] = {
 	.class_hid = BNXT_ULP_CLASS_HID_17167,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 4298386432UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -27695,18 +27695,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1189] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11685,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 4832103424UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -27719,16 +27719,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1190] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1024f,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 4832111616UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -27741,17 +27741,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1191] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1524d,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 4833152000UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -27764,17 +27764,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1192] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14e0f,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 4833160192UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -27787,18 +27787,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1193] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1345f,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 4834200576UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -27811,17 +27811,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1194] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1201d,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 4834208768UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -27834,18 +27834,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1195] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1705f,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 4835249152UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -27858,18 +27858,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1196] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16c1d,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 4835257344UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -27882,19 +27882,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1197] = {
 	.class_hid = BNXT_ULP_CLASS_HID_100ef,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 5368974336UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -27907,16 +27907,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1198] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11d0f,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 5368982528UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -27929,17 +27929,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1199] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14ccf,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 5370022912UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -27952,17 +27952,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1200] = {
 	.class_hid = BNXT_ULP_CLASS_HID_158ef,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 5370031104UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -27975,18 +27975,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1201] = {
 	.class_hid = BNXT_ULP_CLASS_HID_12eed,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 5371071488UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -27999,17 +27999,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1202] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13b0d,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 5371079680UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -28022,18 +28022,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1203] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16acd,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 5372120064UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -28046,18 +28046,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1204] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16687,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 5372128256UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -28070,19 +28070,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1205] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11c07,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 5905845248UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -28095,17 +28095,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1206] = {
 	.class_hid = BNXT_ULP_CLASS_HID_117c5,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 5905853440UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -28118,18 +28118,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1207] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1478d,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 5906893824UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -28142,18 +28142,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1208] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1538d,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 5906902016UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -28166,19 +28166,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1209] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13a05,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 5907942400UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -28191,18 +28191,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1210] = {
 	.class_hid = BNXT_ULP_CLASS_HID_135cf,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 5907950592UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -28215,19 +28215,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1211] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1658f,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 5908990976UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -28240,19 +28240,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1212] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1718f,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 5908999168UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -28265,20 +28265,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1213] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11667,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 6442716160UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -28291,16 +28291,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1214] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10225,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 6442724352UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -28313,17 +28313,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1215] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15247,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 6443764736UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -28336,17 +28336,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1216] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14e05,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 6443772928UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -28359,18 +28359,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1217] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13455,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 6444813312UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -28383,17 +28383,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1218] = {
 	.class_hid = BNXT_ULP_CLASS_HID_12017,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 6444821504UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -28406,18 +28406,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1219] = {
 	.class_hid = BNXT_ULP_CLASS_HID_17035,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 6445861888UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -28430,18 +28430,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1220] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16bf7,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 6445870080UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -28454,19 +28454,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1221] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10115,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 6979587072UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -28479,17 +28479,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1222] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11d15,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 6979595264UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -28502,18 +28502,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1223] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14d05,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 6980635648UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -28526,18 +28526,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1224] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15905,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 6980643840UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -28550,19 +28550,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1225] = {
 	.class_hid = BNXT_ULP_CLASS_HID_12f17,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 6981684224UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -28575,18 +28575,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1226] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13b17,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 6981692416UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -28599,19 +28599,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1227] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16ad7,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 6982732800UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -28624,19 +28624,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1228] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16695,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 6982740992UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -28649,20 +28649,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1229] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11be5,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 7516457984UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -28675,17 +28675,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1230] = {
 	.class_hid = BNXT_ULP_CLASS_HID_117a7,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 7516466176UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -28698,18 +28698,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1231] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14767,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 7517506560UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -28722,18 +28722,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1232] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15387,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 7517514752UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -28746,19 +28746,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1233] = {
 	.class_hid = BNXT_ULP_CLASS_HID_139e7,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 7518555136UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -28771,18 +28771,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1234] = {
 	.class_hid = BNXT_ULP_CLASS_HID_135a5,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 7518563328UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -28795,19 +28795,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1235] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16565,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 7519603712UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -28820,19 +28820,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1236] = {
 	.class_hid = BNXT_ULP_CLASS_HID_17185,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 7519611904UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -28845,20 +28845,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1237] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11687,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 8053328896UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -28871,18 +28871,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1238] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10245,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 8053337088UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -28895,19 +28895,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1239] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15287,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 8054377472UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -28920,19 +28920,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1240] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14e45,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 8054385664UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -28945,20 +28945,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1241] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13485,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 8055426048UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -28971,19 +28971,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1242] = {
 	.class_hid = BNXT_ULP_CLASS_HID_12047,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 8055434240UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -28996,20 +28996,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1243] = {
 	.class_hid = BNXT_ULP_CLASS_HID_17085,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 8056474624UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -29022,20 +29022,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1244] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16c47,
 	.class_tid = 2,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 24,
 	.flow_sig_id = 8056482816UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -29048,21 +29048,21 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT }
 	},
 	[1245] = {
 	.class_hid = BNXT_ULP_CLASS_HID_400f4,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 66304UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -29075,14 +29075,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI }
 	},
 	[1246] = {
 	.class_hid = BNXT_ULP_CLASS_HID_410c8,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 68352UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -29095,15 +29095,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI }
 	},
 	[1247] = {
 	.class_hid = BNXT_ULP_CLASS_HID_51084,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 328448UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -29116,15 +29116,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC }
 	},
 	[1248] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50ffe,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 330496UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -29137,16 +29137,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC }
 	},
 	[1249] = {
 	.class_hid = BNXT_ULP_CLASS_HID_488cc,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 590592UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -29159,15 +29159,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC }
 	},
 	[1250] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48726,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 592640UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -29180,16 +29180,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC }
 	},
 	[1251] = {
 	.class_hid = BNXT_ULP_CLASS_HID_587f2,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 852736UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -29202,16 +29202,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC }
 	},
 	[1252] = {
 	.class_hid = BNXT_ULP_CLASS_HID_597b6,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 854784UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -29224,17 +29224,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC }
 	},
 	[1253] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41b10,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 536937216UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -29247,15 +29247,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[1254] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40b8a,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 536939264UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -29268,16 +29268,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[1255] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50a46,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 537199360UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -29290,16 +29290,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[1256] = {
 	.class_hid = BNXT_ULP_CLASS_HID_51a1a,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 537201408UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -29312,17 +29312,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[1257] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4838e,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 537461504UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -29335,16 +29335,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[1258] = {
 	.class_hid = BNXT_ULP_CLASS_HID_49242,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 537463552UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -29357,17 +29357,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[1259] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5921e,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 537723648UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -29380,17 +29380,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[1260] = {
 	.class_hid = BNXT_ULP_CLASS_HID_58150,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 537725696UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -29403,18 +29403,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[1261] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41686,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 1073808128UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -29427,15 +29427,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1262] = {
 	.class_hid = BNXT_ULP_CLASS_HID_405e8,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 1073810176UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -29448,16 +29448,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1263] = {
 	.class_hid = BNXT_ULP_CLASS_HID_505a4,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 1074070272UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -29470,16 +29470,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1264] = {
 	.class_hid = BNXT_ULP_CLASS_HID_51588,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 1074072320UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -29492,17 +29492,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1265] = {
 	.class_hid = BNXT_ULP_CLASS_HID_49d4e,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 1074332416UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -29515,16 +29515,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1266] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48da0,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 1074334464UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -29537,17 +29537,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1267] = {
 	.class_hid = BNXT_ULP_CLASS_HID_58d8c,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 1074594560UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -29560,17 +29560,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1268] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59c40,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 1074596608UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -29583,18 +29583,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1269] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40040,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 1610679040UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -29607,16 +29607,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1270] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41004,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 1610681088UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -29629,17 +29629,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1271] = {
 	.class_hid = BNXT_ULP_CLASS_HID_510c0,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 1610941184UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -29652,17 +29652,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1272] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50f4a,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 1610943232UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -29675,18 +29675,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1273] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48808,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 1611203328UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -29699,17 +29699,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1274] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48742,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 1611205376UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -29722,18 +29722,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1275] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5874e,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 1611465472UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -29746,18 +29746,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1276] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59702,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 1611467520UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -29770,19 +29770,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1277] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41bfe,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 2147549952UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -29795,15 +29795,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1278] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40a58,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 2147552000UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -29816,16 +29816,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1279] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50a2c,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 2147812096UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -29838,16 +29838,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1280] = {
 	.class_hid = BNXT_ULP_CLASS_HID_51ae8,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 2147814144UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -29860,17 +29860,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1281] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4825c,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 2148074240UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -29883,16 +29883,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1282] = {
 	.class_hid = BNXT_ULP_CLASS_HID_49228,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 2148076288UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -29905,17 +29905,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1283] = {
 	.class_hid = BNXT_ULP_CLASS_HID_592ec,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 2148336384UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -29928,17 +29928,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1284] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5815e,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 2148338432UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -29951,18 +29951,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1285] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41698,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 2684420864UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -29975,16 +29975,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1286] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4051a,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 2684422912UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -29997,17 +29997,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1287] = {
 	.class_hid = BNXT_ULP_CLASS_HID_505ce,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 2684683008UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -30020,17 +30020,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1288] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5158a,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 2684685056UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -30043,18 +30043,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1289] = {
 	.class_hid = BNXT_ULP_CLASS_HID_49d58,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 2684945152UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -30067,17 +30067,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1290] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48dca,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 2684947200UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -30090,18 +30090,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1291] = {
 	.class_hid = BNXT_ULP_CLASS_HID_58d8e,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 2685207296UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -30114,18 +30114,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1292] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59c5a,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 2685209344UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -30138,19 +30138,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1293] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4002e,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 3221291776UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -30163,16 +30163,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1294] = {
 	.class_hid = BNXT_ULP_CLASS_HID_410ea,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 3221293824UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -30185,17 +30185,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1295] = {
 	.class_hid = BNXT_ULP_CLASS_HID_510ae,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 3221553920UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -30208,17 +30208,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1296] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50f08,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 3221555968UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -30231,18 +30231,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1297] = {
 	.class_hid = BNXT_ULP_CLASS_HID_488ee,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 3221816064UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -30255,17 +30255,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1298] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48748,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 3221818112UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -30278,18 +30278,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1299] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5870c,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 3222078208UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -30302,18 +30302,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1300] = {
 	.class_hid = BNXT_ULP_CLASS_HID_597e8,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 3222080256UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -30326,19 +30326,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1301] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41b4a,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 3758162688UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -30351,17 +30351,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1302] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40b8c,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 3758164736UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -30374,18 +30374,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1303] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50a48,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 3758424832UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -30398,18 +30398,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1304] = {
 	.class_hid = BNXT_ULP_CLASS_HID_51a0c,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 3758426880UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -30422,19 +30422,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1305] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48388,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 3758686976UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -30447,18 +30447,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1306] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4924c,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 3758689024UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -30471,19 +30471,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1307] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59208,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 3758949120UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -30496,19 +30496,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1308] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5828a,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 3758951168UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -30521,20 +30521,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1309] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40540,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 4295033600UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -30547,15 +30547,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1310] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41500,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 4295035648UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -30568,16 +30568,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1311] = {
 	.class_hid = BNXT_ULP_CLASS_HID_515d0,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 4295295744UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -30590,16 +30590,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1312] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5044a,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 4295297792UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -30612,17 +30612,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1313] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48d18,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 4295557888UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -30635,16 +30635,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1314] = {
 	.class_hid = BNXT_ULP_CLASS_HID_49dd8,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 4295559936UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -30657,17 +30657,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1315] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59da8,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 4295820032UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -30680,17 +30680,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1316] = {
 	.class_hid = BNXT_ULP_CLASS_HID_58c02,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 4295822080UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -30703,18 +30703,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1317] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41048,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 4831904512UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -30727,16 +30727,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1318] = {
 	.class_hid = BNXT_ULP_CLASS_HID_400c2,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 4831906560UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -30749,17 +30749,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1319] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50092,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 4832166656UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -30772,17 +30772,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1320] = {
 	.class_hid = BNXT_ULP_CLASS_HID_51f52,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 4832168704UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -30795,18 +30795,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1321] = {
 	.class_hid = BNXT_ULP_CLASS_HID_49800,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 4832428800UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -30819,17 +30819,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1322] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4889a,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 4832430848UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -30842,18 +30842,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1323] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5974a,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 4832690944UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -30866,18 +30866,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1324] = {
 	.class_hid = BNXT_ULP_CLASS_HID_587c8,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 4832692992UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -30890,19 +30890,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1325] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40bc2,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 5368775424UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -30915,16 +30915,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1326] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41b82,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 5368777472UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -30937,17 +30937,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1327] = {
 	.class_hid = BNXT_ULP_CLASS_HID_51a62,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 5369037568UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -30960,17 +30960,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1328] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50ac0,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 5369039616UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -30983,18 +30983,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1329] = {
 	.class_hid = BNXT_ULP_CLASS_HID_493aa,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 5369299712UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -31007,17 +31007,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1330] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48208,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 5369301760UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -31030,18 +31030,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1331] = {
 	.class_hid = BNXT_ULP_CLASS_HID_582c8,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 5369561856UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -31054,18 +31054,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1332] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59288,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 5369563904UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -31078,19 +31078,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1333] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40688,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 5905646336UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -31103,17 +31103,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1334] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41540,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 5905648384UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -31126,18 +31126,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1335] = {
 	.class_hid = BNXT_ULP_CLASS_HID_51508,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 5905908480UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -31150,18 +31150,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1336] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50582,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 5905910528UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -31174,19 +31174,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1337] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48d40,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 5906170624UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -31199,18 +31199,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1338] = {
 	.class_hid = BNXT_ULP_CLASS_HID_49d08,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 5906172672UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -31223,19 +31223,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1339] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59dc0,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 5906432768UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -31248,19 +31248,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1340] = {
 	.class_hid = BNXT_ULP_CLASS_HID_58c4a,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 5906434816UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -31273,20 +31273,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1341] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4104a,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 6442517248UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -31299,16 +31299,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1342] = {
 	.class_hid = BNXT_ULP_CLASS_HID_400a8,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 6442519296UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -31321,17 +31321,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1343] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50f78,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 6442779392UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -31344,17 +31344,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1344] = {
 	.class_hid = BNXT_ULP_CLASS_HID_51f38,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 6442781440UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -31367,18 +31367,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1345] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4980a,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 6443041536UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -31391,17 +31391,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1346] = {
 	.class_hid = BNXT_ULP_CLASS_HID_49768,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 6443043584UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -31414,18 +31414,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1347] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59738,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 6443303680UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -31438,18 +31438,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1348] = {
 	.class_hid = BNXT_ULP_CLASS_HID_587aa,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 6443305728UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -31462,19 +31462,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1349] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40bd8,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 6979388160UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -31487,17 +31487,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1350] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41bc8,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 6979390208UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -31510,18 +31510,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1351] = {
 	.class_hid = BNXT_ULP_CLASS_HID_51b88,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 6979650304UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -31534,18 +31534,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1352] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50ada,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 6979652352UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -31558,19 +31558,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1353] = {
 	.class_hid = BNXT_ULP_CLASS_HID_493c8,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 6979912448UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -31583,18 +31583,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1354] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4820a,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 6979914496UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -31607,19 +31607,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1355] = {
 	.class_hid = BNXT_ULP_CLASS_HID_582da,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 6980174592UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -31632,19 +31632,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1356] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5929a,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 6980176640UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -31657,20 +31657,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1357] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4056a,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 7516259072UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -31683,17 +31683,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1358] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4152a,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 7516261120UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -31706,18 +31706,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1359] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5150a,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 7516521216UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -31730,18 +31730,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1360] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50468,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 7516523264UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -31754,19 +31754,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1361] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48d2a,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 7516783360UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -31779,18 +31779,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1362] = {
 	.class_hid = BNXT_ULP_CLASS_HID_49dea,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 7516785408UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -31803,19 +31803,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1363] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59dca,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 7517045504UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -31828,19 +31828,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1364] = {
 	.class_hid = BNXT_ULP_CLASS_HID_58c28,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 7517047552UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -31853,20 +31853,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1365] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4118a,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 8053129984UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -31879,18 +31879,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1366] = {
 	.class_hid = BNXT_ULP_CLASS_HID_400c8,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 8053132032UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -31903,19 +31903,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1367] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50088,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 8053392128UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -31928,19 +31928,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1368] = {
 	.class_hid = BNXT_ULP_CLASS_HID_51088,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 8053394176UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -31953,20 +31953,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1369] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4984a,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 8053654272UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -31979,19 +31979,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1370] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48888,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 8053656320UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -32004,20 +32004,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1371] = {
 	.class_hid = BNXT_ULP_CLASS_HID_58888,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 8053916416UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -32030,20 +32030,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1372] = {
 	.class_hid = BNXT_ULP_CLASS_HID_587ca,
 	.class_tid = 2,
-	.hdr_sig_id = 12,
+	.hdr_sig_id = 25,
 	.flow_sig_id = 8053918464UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -32056,21 +32056,21 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT }
 	},
 	[1373] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10690,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 265216UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -32083,14 +32083,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI }
 	},
 	[1374] = {
 	.class_hid = BNXT_ULP_CLASS_HID_112b0,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 273408UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -32103,15 +32103,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI }
 	},
 	[1375] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1428c,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 1313792UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -32124,15 +32124,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC }
 	},
 	[1376] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15eac,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 1321984UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -32145,16 +32145,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC }
 	},
 	[1377] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1249e,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 2362368UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -32167,15 +32167,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC }
 	},
 	[1378] = {
 	.class_hid = BNXT_ULP_CLASS_HID_130be,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 2370560UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -32188,16 +32188,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC }
 	},
 	[1379] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16f7a,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 3410944UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -32210,16 +32210,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC }
 	},
 	[1380] = {
 	.class_hid = BNXT_ULP_CLASS_HID_17c9a,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 3419136UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -32232,17 +32232,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC }
 	},
 	[1381] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1119a,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 2147748864UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -32255,15 +32255,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[1382] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10c58,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 2147757056UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -32276,16 +32276,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[1383] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15c7e,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 2148797440UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -32298,16 +32298,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[1384] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1483c,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 2148805632UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -32320,17 +32320,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[1385] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13f88,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 2149846016UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -32343,16 +32343,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[1386] = {
 	.class_hid = BNXT_ULP_CLASS_HID_12a4e,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 2149854208UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -32365,17 +32365,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[1387] = {
 	.class_hid = BNXT_ULP_CLASS_HID_17a6c,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 2150894592UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -32388,17 +32388,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[1388] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1762a,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 2150902784UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -32411,18 +32411,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[1389] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11b46,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 4295232512UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -32435,15 +32435,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1390] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11704,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 4295240704UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -32456,16 +32456,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1391] = {
 	.class_hid = BNXT_ULP_CLASS_HID_147c4,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 4296281088UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -32478,16 +32478,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1392] = {
 	.class_hid = BNXT_ULP_CLASS_HID_153e4,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 4296289280UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -32500,17 +32500,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1393] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13934,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 4297329664UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -32523,16 +32523,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1394] = {
 	.class_hid = BNXT_ULP_CLASS_HID_135f6,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 4297337856UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -32545,17 +32545,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1395] = {
 	.class_hid = BNXT_ULP_CLASS_HID_165ce,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 4298378240UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -32568,17 +32568,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1396] = {
 	.class_hid = BNXT_ULP_CLASS_HID_171ee,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 4298386432UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -32591,18 +32591,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1397] = {
 	.class_hid = BNXT_ULP_CLASS_HID_116ee,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 6442716160UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -32615,16 +32615,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1398] = {
 	.class_hid = BNXT_ULP_CLASS_HID_102ac,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 6442724352UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -32637,17 +32637,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1399] = {
 	.class_hid = BNXT_ULP_CLASS_HID_152ce,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 6443764736UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -32660,17 +32660,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1400] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14e8c,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 6443772928UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -32683,18 +32683,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1401] = {
 	.class_hid = BNXT_ULP_CLASS_HID_134dc,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 6444813312UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -32707,17 +32707,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1402] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1209e,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 6444821504UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -32730,18 +32730,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1403] = {
 	.class_hid = BNXT_ULP_CLASS_HID_170bc,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 6445861888UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -32754,18 +32754,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1404] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16b7e,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 6445870080UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -32778,19 +32778,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1405] = {
 	.class_hid = BNXT_ULP_CLASS_HID_119ae,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 8590199808UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -32803,15 +32803,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1406] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1146a,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 8590208000UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -32824,16 +32824,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1407] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14426,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 8591248384UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -32846,16 +32846,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1408] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15046,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 8591256576UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -32868,17 +32868,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1409] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1263a,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 8592296960UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -32891,16 +32891,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1410] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1325a,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 8592305152UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -32913,17 +32913,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1411] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16216,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 8593345536UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -32936,17 +32936,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1412] = {
 	.class_hid = BNXT_ULP_CLASS_HID_17e36,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 8593353728UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -32959,18 +32959,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1413] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1133e,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 10737683456UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -32983,16 +32983,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1414] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10ffa,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 10737691648UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -33005,17 +33005,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1415] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15f1a,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 10738732032UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -33028,17 +33028,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1416] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14bee,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 10738740224UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -33051,18 +33051,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1417] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1312a,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 10739780608UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -33075,17 +33075,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1418] = {
 	.class_hid = BNXT_ULP_CLASS_HID_12dea,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 10739788800UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -33098,18 +33098,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1419] = {
 	.class_hid = BNXT_ULP_CLASS_HID_17d1e,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 10740829184UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -33122,18 +33122,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1420] = {
 	.class_hid = BNXT_ULP_CLASS_HID_169de,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 10740837376UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -33146,19 +33146,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1421] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11ee6,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 12885167104UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -33171,16 +33171,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1422] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10abe,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 12885175296UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -33193,17 +33193,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1423] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15ade,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 12886215680UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -33216,17 +33216,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1424] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1569e,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 12886223872UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -33239,18 +33239,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1425] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13cee,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 12887264256UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -33263,17 +33263,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1426] = {
 	.class_hid = BNXT_ULP_CLASS_HID_128ae,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 12887272448UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -33286,18 +33286,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1427] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1676e,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 12888312832UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -33310,18 +33310,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1428] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1748e,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 12888321024UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -33334,19 +33334,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1429] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1098e,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 15032650752UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -33359,17 +33359,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1430] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1044e,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 15032658944UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -33382,18 +33382,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1431] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1546e,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 15033699328UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -33406,18 +33406,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1432] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1402e,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 15033707520UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -33430,19 +33430,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1433] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1367e,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 15034747904UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -33455,18 +33455,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1434] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1223e,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 15034756096UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -33479,19 +33479,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1435] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1725e,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 15035796480UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -33504,19 +33504,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1436] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16e1e,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 15035804672UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -33529,20 +33529,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT }
 	},
 	[1437] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1172f,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 17180134400UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -33555,15 +33555,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1438] = {
 	.class_hid = BNXT_ULP_CLASS_HID_103ed,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 17180142592UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -33576,16 +33576,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1439] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1530b,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 17181182976UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -33598,16 +33598,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1440] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14fc9,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 17181191168UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -33620,17 +33620,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1441] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1351d,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 17182231552UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -33643,16 +33643,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1442] = {
 	.class_hid = BNXT_ULP_CLASS_HID_121db,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 17182239744UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -33665,17 +33665,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1443] = {
 	.class_hid = BNXT_ULP_CLASS_HID_171f9,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 17183280128UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -33688,17 +33688,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1444] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16db7,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 17183288320UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -33711,18 +33711,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1445] = {
 	.class_hid = BNXT_ULP_CLASS_HID_102bf,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 19327618048UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -33735,16 +33735,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1446] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11edf,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 19327626240UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -33757,17 +33757,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1447] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14e9b,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 19328666624UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -33780,17 +33780,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1448] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15abb,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 19328674816UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -33803,18 +33803,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1449] = {
 	.class_hid = BNXT_ULP_CLASS_HID_120ad,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 19329715200UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -33827,17 +33827,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1450] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13ccd,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 19329723392UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -33850,18 +33850,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1451] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16c89,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 19330763776UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -33874,18 +33874,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1452] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1675f,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 19330771968UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -33898,19 +33898,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1453] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10c67,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 21475101696UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -33923,16 +33923,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1454] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11987,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 21475109888UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -33945,17 +33945,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1455] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1485f,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 21476150272UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -33968,17 +33968,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1456] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1441d,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 21476158464UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -33991,18 +33991,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1457] = {
 	.class_hid = BNXT_ULP_CLASS_HID_12a55,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 21477198848UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -34015,17 +34015,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1458] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1262f,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 21477207040UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -34038,18 +34038,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1459] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1764d,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 21478247424UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -34062,18 +34062,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1460] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1620f,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 21478255616UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -34086,19 +34086,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1461] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1070f,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 23622585344UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -34111,17 +34111,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1462] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1132f,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 23622593536UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -34134,18 +34134,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1463] = {
 	.class_hid = BNXT_ULP_CLASS_HID_143ef,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 23623633920UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -34158,18 +34158,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1464] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15f0f,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 23623642112UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -34182,19 +34182,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1465] = {
 	.class_hid = BNXT_ULP_CLASS_HID_125fd,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 23624682496UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -34207,18 +34207,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1466] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1311d,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 23624690688UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -34231,19 +34231,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1467] = {
 	.class_hid = BNXT_ULP_CLASS_HID_161dd,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 23625731072UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -34256,19 +34256,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1468] = {
 	.class_hid = BNXT_ULP_CLASS_HID_17dfd,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 23625739264UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -34281,20 +34281,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1469] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10acb,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 25770068992UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -34307,16 +34307,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1470] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10687,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 25770077184UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -34329,17 +34329,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1471] = {
 	.class_hid = BNXT_ULP_CLASS_HID_156a7,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 25771117568UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -34352,17 +34352,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1472] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14163,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 25771125760UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -34375,18 +34375,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1473] = {
 	.class_hid = BNXT_ULP_CLASS_HID_128b7,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 25772166144UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -34399,17 +34399,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1474] = {
 	.class_hid = BNXT_ULP_CLASS_HID_12377,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 25772174336UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -34422,18 +34422,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1475] = {
 	.class_hid = BNXT_ULP_CLASS_HID_17493,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 25773214720UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -34446,18 +34446,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1476] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16f53,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 25773222912UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -34470,19 +34470,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1477] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1045b,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 27917552640UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -34495,17 +34495,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1478] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1107b,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 27917560832UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -34518,18 +34518,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1479] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1404f,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 27918601216UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -34542,18 +34542,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1480] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15c6f,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 27918609408UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -34566,19 +34566,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1481] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1225f,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 27919649792UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -34591,18 +34591,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1482] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13e7f,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 27919657984UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -34615,19 +34615,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1483] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16e3b,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 27920698368UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -34640,19 +34640,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1484] = {
 	.class_hid = BNXT_ULP_CLASS_HID_17a5b,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 27920706560UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -34665,20 +34665,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1485] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10f1f,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 30065036288UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -34691,17 +34691,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1486] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11b3f,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 30065044480UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -34714,18 +34714,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1487] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14bff,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 30066084864UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -34738,18 +34738,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1488] = {
 	.class_hid = BNXT_ULP_CLASS_HID_147b7,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 30066093056UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -34762,19 +34762,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1489] = {
 	.class_hid = BNXT_ULP_CLASS_HID_12d0f,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 30067133440UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -34787,18 +34787,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1490] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1392f,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 30067141632UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -34811,19 +34811,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1491] = {
 	.class_hid = BNXT_ULP_CLASS_HID_169e7,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 30068182016UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -34836,19 +34836,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1492] = {
 	.class_hid = BNXT_ULP_CLASS_HID_165a7,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 30068190208UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -34861,20 +34861,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1493] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11a0f,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 32212519936UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -34887,18 +34887,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1494] = {
 	.class_hid = BNXT_ULP_CLASS_HID_116cf,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 32212528128UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -34911,19 +34911,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1495] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1468f,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 32213568512UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -34936,19 +34936,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1496] = {
 	.class_hid = BNXT_ULP_CLASS_HID_152af,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 32213576704UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -34961,20 +34961,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1497] = {
 	.class_hid = BNXT_ULP_CLASS_HID_138ff,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 32214617088UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -34987,19 +34987,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1498] = {
 	.class_hid = BNXT_ULP_CLASS_HID_134bf,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 32214625280UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -35012,20 +35012,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1499] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1648f,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 32215665664UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -35038,20 +35038,20 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1500] = {
 	.class_hid = BNXT_ULP_CLASS_HID_170af,
 	.class_tid = 2,
-	.hdr_sig_id = 13,
+	.hdr_sig_id = 26,
 	.flow_sig_id = 32215673856UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -35064,21 +35064,21 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT }
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT }
 	},
 	[1501] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40c38,
 	.class_tid = 2,
-	.hdr_sig_id = 14,
+	.hdr_sig_id = 27,
 	.flow_sig_id = 66304UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -35091,14 +35091,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_T_VXLAN_VNI }
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_T_VXLAN_VNI }
 	},
 	[1502] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41c04,
 	.class_tid = 2,
-	.hdr_sig_id = 14,
+	.hdr_sig_id = 27,
 	.flow_sig_id = 68352UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -35111,15 +35111,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_14_BITMASK_T_VXLAN_VNI }
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_27_BITMASK_T_VXLAN_VNI }
 	},
 	[1503] = {
 	.class_hid = BNXT_ULP_CLASS_HID_51c48,
 	.class_tid = 2,
-	.hdr_sig_id = 14,
+	.hdr_sig_id = 27,
 	.flow_sig_id = 328448UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -35132,15 +35132,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_ETH_DMAC }
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_ETH_DMAC }
 	},
 	[1504] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50332,
 	.class_tid = 2,
-	.hdr_sig_id = 14,
+	.hdr_sig_id = 27,
 	.flow_sig_id = 330496UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -35153,16 +35153,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_14_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_ETH_DMAC }
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_27_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_ETH_DMAC }
 	},
 	[1505] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48400,
 	.class_tid = 2,
-	.hdr_sig_id = 14,
+	.hdr_sig_id = 27,
 	.flow_sig_id = 590592UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -35175,15 +35175,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_ETH_SMAC }
 	},
 	[1506] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48bea,
 	.class_tid = 2,
-	.hdr_sig_id = 14,
+	.hdr_sig_id = 27,
 	.flow_sig_id = 592640UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -35196,16 +35196,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_14_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_27_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_ETH_SMAC }
 	},
 	[1507] = {
 	.class_hid = BNXT_ULP_CLASS_HID_58b3e,
 	.class_tid = 2,
-	.hdr_sig_id = 14,
+	.hdr_sig_id = 27,
 	.flow_sig_id = 852736UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -35218,16 +35218,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_ETH_SMAC }
 	},
 	[1508] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59b7a,
 	.class_tid = 2,
-	.hdr_sig_id = 14,
+	.hdr_sig_id = 27,
 	.flow_sig_id = 854784UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -35240,17 +35240,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_14_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_27_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_ETH_SMAC }
 	},
 	[1509] = {
 	.class_hid = BNXT_ULP_CLASS_HID_417dc,
 	.class_tid = 2,
-	.hdr_sig_id = 14,
+	.hdr_sig_id = 27,
 	.flow_sig_id = 536937216UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -35263,15 +35263,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[1510] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40746,
 	.class_tid = 2,
-	.hdr_sig_id = 14,
+	.hdr_sig_id = 27,
 	.flow_sig_id = 536939264UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -35284,16 +35284,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_14_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_27_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[1511] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5068a,
 	.class_tid = 2,
-	.hdr_sig_id = 14,
+	.hdr_sig_id = 27,
 	.flow_sig_id = 537199360UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -35306,16 +35306,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[1512] = {
 	.class_hid = BNXT_ULP_CLASS_HID_516d6,
 	.class_tid = 2,
-	.hdr_sig_id = 14,
+	.hdr_sig_id = 27,
 	.flow_sig_id = 537201408UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -35328,17 +35328,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_14_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_27_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[1513] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48f42,
 	.class_tid = 2,
-	.hdr_sig_id = 14,
+	.hdr_sig_id = 27,
 	.flow_sig_id = 537461504UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -35351,16 +35351,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[1514] = {
 	.class_hid = BNXT_ULP_CLASS_HID_49e8e,
 	.class_tid = 2,
-	.hdr_sig_id = 14,
+	.hdr_sig_id = 27,
 	.flow_sig_id = 537463552UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -35373,17 +35373,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_14_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_27_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[1515] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59ed2,
 	.class_tid = 2,
-	.hdr_sig_id = 14,
+	.hdr_sig_id = 27,
 	.flow_sig_id = 537723648UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -35396,17 +35396,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[1516] = {
 	.class_hid = BNXT_ULP_CLASS_HID_58d9c,
 	.class_tid = 2,
-	.hdr_sig_id = 14,
+	.hdr_sig_id = 27,
 	.flow_sig_id = 537725696UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -35419,18 +35419,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_14_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_27_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[1517] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41a4a,
 	.class_tid = 2,
-	.hdr_sig_id = 14,
+	.hdr_sig_id = 27,
 	.flow_sig_id = 1073808128UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -35443,15 +35443,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1518] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40924,
 	.class_tid = 2,
-	.hdr_sig_id = 14,
+	.hdr_sig_id = 27,
 	.flow_sig_id = 1073810176UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -35464,16 +35464,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_14_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_27_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1519] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50968,
 	.class_tid = 2,
-	.hdr_sig_id = 14,
+	.hdr_sig_id = 27,
 	.flow_sig_id = 1074070272UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -35486,16 +35486,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1520] = {
 	.class_hid = BNXT_ULP_CLASS_HID_51944,
 	.class_tid = 2,
-	.hdr_sig_id = 14,
+	.hdr_sig_id = 27,
 	.flow_sig_id = 1074072320UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -35508,17 +35508,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_14_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_27_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1521] = {
 	.class_hid = BNXT_ULP_CLASS_HID_49182,
 	.class_tid = 2,
-	.hdr_sig_id = 14,
+	.hdr_sig_id = 27,
 	.flow_sig_id = 1074332416UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -35531,16 +35531,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1522] = {
 	.class_hid = BNXT_ULP_CLASS_HID_4816c,
 	.class_tid = 2,
-	.hdr_sig_id = 14,
+	.hdr_sig_id = 27,
 	.flow_sig_id = 1074334464UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -35553,17 +35553,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_14_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_27_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1523] = {
 	.class_hid = BNXT_ULP_CLASS_HID_58140,
 	.class_tid = 2,
-	.hdr_sig_id = 14,
+	.hdr_sig_id = 27,
 	.flow_sig_id = 1074594560UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -35576,17 +35576,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1524] = {
 	.class_hid = BNXT_ULP_CLASS_HID_5908c,
 	.class_tid = 2,
-	.hdr_sig_id = 14,
+	.hdr_sig_id = 27,
 	.flow_sig_id = 1074596608UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -35599,18 +35599,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_14_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_27_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1525] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40c8c,
 	.class_tid = 2,
-	.hdr_sig_id = 14,
+	.hdr_sig_id = 27,
 	.flow_sig_id = 1610679040UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -35623,16 +35623,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1526] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41cc8,
 	.class_tid = 2,
-	.hdr_sig_id = 14,
+	.hdr_sig_id = 27,
 	.flow_sig_id = 1610681088UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -35645,17 +35645,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_14_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_27_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1527] = {
 	.class_hid = BNXT_ULP_CLASS_HID_51c0c,
 	.class_tid = 2,
-	.hdr_sig_id = 14,
+	.hdr_sig_id = 27,
 	.flow_sig_id = 1610941184UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -35668,17 +35668,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1528] = {
 	.class_hid = BNXT_ULP_CLASS_HID_50386,
 	.class_tid = 2,
-	.hdr_sig_id = 14,
+	.hdr_sig_id = 27,
 	.flow_sig_id = 1610943232UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -35691,18 +35691,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_14_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_27_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1529] = {
 	.class_hid = BNXT_ULP_CLASS_HID_484c4,
 	.class_tid = 2,
-	.hdr_sig_id = 14,
+	.hdr_sig_id = 27,
 	.flow_sig_id = 1611203328UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -35715,17 +35715,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1530] = {
 	.class_hid = BNXT_ULP_CLASS_HID_48b8e,
 	.class_tid = 2,
-	.hdr_sig_id = 14,
+	.hdr_sig_id = 27,
 	.flow_sig_id = 1611205376UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -35738,18 +35738,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_14_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_27_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1531] = {
 	.class_hid = BNXT_ULP_CLASS_HID_58b82,
 	.class_tid = 2,
-	.hdr_sig_id = 14,
+	.hdr_sig_id = 27,
 	.flow_sig_id = 1611465472UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -35762,18 +35762,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1532] = {
 	.class_hid = BNXT_ULP_CLASS_HID_59bce,
 	.class_tid = 2,
-	.hdr_sig_id = 14,
+	.hdr_sig_id = 27,
 	.flow_sig_id = 1611467520UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -35786,19 +35786,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_14_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_14_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_27_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_27_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1533] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10a54,
 	.class_tid = 2,
-	.hdr_sig_id = 15,
+	.hdr_sig_id = 28,
 	.flow_sig_id = 265216UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -35811,14 +35811,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI }
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_T_VXLAN_VNI }
 	},
 	[1534] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11e74,
 	.class_tid = 2,
-	.hdr_sig_id = 15,
+	.hdr_sig_id = 28,
 	.flow_sig_id = 273408UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -35831,15 +35831,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI }
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_28_BITMASK_T_VXLAN_VNI }
 	},
 	[1535] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14e48,
 	.class_tid = 2,
-	.hdr_sig_id = 15,
+	.hdr_sig_id = 28,
 	.flow_sig_id = 1313792UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -35852,15 +35852,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_DMAC }
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_ETH_DMAC }
 	},
 	[1536] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15268,
 	.class_tid = 2,
-	.hdr_sig_id = 15,
+	.hdr_sig_id = 28,
 	.flow_sig_id = 1321984UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -35873,16 +35873,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_DMAC }
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_28_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_ETH_DMAC }
 	},
 	[1537] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1285a,
 	.class_tid = 2,
-	.hdr_sig_id = 15,
+	.hdr_sig_id = 28,
 	.flow_sig_id = 2362368UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -35895,15 +35895,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_ETH_SMAC }
 	},
 	[1538] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13c7a,
 	.class_tid = 2,
-	.hdr_sig_id = 15,
+	.hdr_sig_id = 28,
 	.flow_sig_id = 2370560UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -35916,16 +35916,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_28_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_ETH_SMAC }
 	},
 	[1539] = {
 	.class_hid = BNXT_ULP_CLASS_HID_163be,
 	.class_tid = 2,
-	.hdr_sig_id = 15,
+	.hdr_sig_id = 28,
 	.flow_sig_id = 3410944UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -35938,16 +35938,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_ETH_SMAC }
 	},
 	[1540] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1705e,
 	.class_tid = 2,
-	.hdr_sig_id = 15,
+	.hdr_sig_id = 28,
 	.flow_sig_id = 3419136UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -35960,17 +35960,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_SMAC }
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_28_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_ETH_SMAC }
 	},
 	[1541] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11d5e,
 	.class_tid = 2,
-	.hdr_sig_id = 15,
+	.hdr_sig_id = 28,
 	.flow_sig_id = 2147748864UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -35983,15 +35983,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[1542] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1009c,
 	.class_tid = 2,
-	.hdr_sig_id = 15,
+	.hdr_sig_id = 28,
 	.flow_sig_id = 2147757056UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -36004,16 +36004,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_28_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[1543] = {
 	.class_hid = BNXT_ULP_CLASS_HID_150ba,
 	.class_tid = 2,
-	.hdr_sig_id = 15,
+	.hdr_sig_id = 28,
 	.flow_sig_id = 2148797440UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -36026,16 +36026,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[1544] = {
 	.class_hid = BNXT_ULP_CLASS_HID_144f8,
 	.class_tid = 2,
-	.hdr_sig_id = 15,
+	.hdr_sig_id = 28,
 	.flow_sig_id = 2148805632UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -36048,17 +36048,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_28_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[1545] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1334c,
 	.class_tid = 2,
-	.hdr_sig_id = 15,
+	.hdr_sig_id = 28,
 	.flow_sig_id = 2149846016UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -36071,16 +36071,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[1546] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1268a,
 	.class_tid = 2,
-	.hdr_sig_id = 15,
+	.hdr_sig_id = 28,
 	.flow_sig_id = 2149854208UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -36093,17 +36093,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_28_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[1547] = {
 	.class_hid = BNXT_ULP_CLASS_HID_176a8,
 	.class_tid = 2,
-	.hdr_sig_id = 15,
+	.hdr_sig_id = 28,
 	.flow_sig_id = 2150894592UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -36116,17 +36116,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[1548] = {
 	.class_hid = BNXT_ULP_CLASS_HID_17aee,
 	.class_tid = 2,
-	.hdr_sig_id = 15,
+	.hdr_sig_id = 28,
 	.flow_sig_id = 2150902784UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -36139,18 +36139,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV4_SRC_ADDR }
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_28_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_IPV4_SRC_ADDR }
 	},
 	[1549] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11782,
 	.class_tid = 2,
-	.hdr_sig_id = 15,
+	.hdr_sig_id = 28,
 	.flow_sig_id = 4295232512UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -36163,15 +36163,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1550] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11bc0,
 	.class_tid = 2,
-	.hdr_sig_id = 15,
+	.hdr_sig_id = 28,
 	.flow_sig_id = 4295240704UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -36184,16 +36184,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_28_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1551] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14b00,
 	.class_tid = 2,
-	.hdr_sig_id = 15,
+	.hdr_sig_id = 28,
 	.flow_sig_id = 4296281088UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -36206,16 +36206,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1552] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15f20,
 	.class_tid = 2,
-	.hdr_sig_id = 15,
+	.hdr_sig_id = 28,
 	.flow_sig_id = 4296289280UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -36228,17 +36228,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_28_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1553] = {
 	.class_hid = BNXT_ULP_CLASS_HID_135f0,
 	.class_tid = 2,
-	.hdr_sig_id = 15,
+	.hdr_sig_id = 28,
 	.flow_sig_id = 4297329664UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -36251,16 +36251,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1554] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13932,
 	.class_tid = 2,
-	.hdr_sig_id = 15,
+	.hdr_sig_id = 28,
 	.flow_sig_id = 4297337856UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -36273,17 +36273,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_28_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1555] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1690a,
 	.class_tid = 2,
-	.hdr_sig_id = 15,
+	.hdr_sig_id = 28,
 	.flow_sig_id = 4298378240UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -36296,17 +36296,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1556] = {
 	.class_hid = BNXT_ULP_CLASS_HID_17d2a,
 	.class_tid = 2,
-	.hdr_sig_id = 15,
+	.hdr_sig_id = 28,
 	.flow_sig_id = 4298386432UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -36319,18 +36319,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_28_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1557] = {
 	.class_hid = BNXT_ULP_CLASS_HID_11a2a,
 	.class_tid = 2,
-	.hdr_sig_id = 15,
+	.hdr_sig_id = 28,
 	.flow_sig_id = 6442716160UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -36343,16 +36343,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1558] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10e68,
 	.class_tid = 2,
-	.hdr_sig_id = 15,
+	.hdr_sig_id = 28,
 	.flow_sig_id = 6442724352UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -36365,17 +36365,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_28_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1559] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15e0a,
 	.class_tid = 2,
-	.hdr_sig_id = 15,
+	.hdr_sig_id = 28,
 	.flow_sig_id = 6443764736UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -36388,17 +36388,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1560] = {
 	.class_hid = BNXT_ULP_CLASS_HID_14248,
 	.class_tid = 2,
-	.hdr_sig_id = 15,
+	.hdr_sig_id = 28,
 	.flow_sig_id = 6443772928UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -36411,18 +36411,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_28_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1561] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13818,
 	.class_tid = 2,
-	.hdr_sig_id = 15,
+	.hdr_sig_id = 28,
 	.flow_sig_id = 6444813312UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -36435,17 +36435,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1562] = {
 	.class_hid = BNXT_ULP_CLASS_HID_12c5a,
 	.class_tid = 2,
-	.hdr_sig_id = 15,
+	.hdr_sig_id = 28,
 	.flow_sig_id = 6444821504UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -36458,18 +36458,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_28_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1563] = {
 	.class_hid = BNXT_ULP_CLASS_HID_17c78,
 	.class_tid = 2,
-	.hdr_sig_id = 15,
+	.hdr_sig_id = 28,
 	.flow_sig_id = 6445861888UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -36482,18 +36482,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1564] = {
 	.class_hid = BNXT_ULP_CLASS_HID_167ba,
 	.class_tid = 2,
-	.hdr_sig_id = 15,
+	.hdr_sig_id = 28,
 	.flow_sig_id = 6445870080UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -36506,19 +36506,19 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_I_ICMP |
 		BNXT_ULP_FLOW_DIR_BITMASK_ING },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_O_UDP_DST_PORT |
-		BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_DMAC |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_SMAC |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_2_15_BITMASK_I_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_O_UDP_DST_PORT |
+		BNXT_ULP_HF_0_2_28_BITMASK_T_VXLAN_VNI |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_ETH_DMAC |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_ETH_SMAC |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_2_28_BITMASK_I_IPV4_DST_ADDR }
 	},
 	[1565] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1f91,
 	.class_tid = 3,
-	.hdr_sig_id = 0,
+	.hdr_sig_id = 29,
 	.flow_sig_id = 4096UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -36527,13 +36527,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_0_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_0_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_29_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_29_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1566] = {
 	.class_hid = BNXT_ULP_CLASS_HID_0763,
 	.class_tid = 3,
-	.hdr_sig_id = 0,
+	.hdr_sig_id = 29,
 	.flow_sig_id = 4100UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -36542,14 +36542,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_0_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_0_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_0_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_29_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_29_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_29_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1567] = {
 	.class_hid = BNXT_ULP_CLASS_HID_0f7b,
 	.class_tid = 3,
-	.hdr_sig_id = 0,
+	.hdr_sig_id = 29,
 	.flow_sig_id = 6144UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -36558,14 +36558,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_0_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_0_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_0_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_29_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_29_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_29_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1568] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16af,
 	.class_tid = 3,
-	.hdr_sig_id = 0,
+	.hdr_sig_id = 29,
 	.flow_sig_id = 6148UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -36574,15 +36574,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_0_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_0_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_0_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_0_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_29_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_29_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_29_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_29_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1569] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1daf,
 	.class_tid = 3,
-	.hdr_sig_id = 1,
+	.hdr_sig_id = 30,
 	.flow_sig_id = 16384UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -36591,13 +36591,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_1_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_30_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_30_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1570] = {
 	.class_hid = BNXT_ULP_CLASS_HID_0539,
 	.class_tid = 3,
-	.hdr_sig_id = 1,
+	.hdr_sig_id = 30,
 	.flow_sig_id = 16388UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -36606,14 +36606,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_1_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_30_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_30_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_30_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1571] = {
 	.class_hid = BNXT_ULP_CLASS_HID_01ed,
 	.class_tid = 3,
-	.hdr_sig_id = 1,
+	.hdr_sig_id = 30,
 	.flow_sig_id = 24576UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -36622,14 +36622,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_1_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_30_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_30_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_30_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1572] = {
 	.class_hid = BNXT_ULP_CLASS_HID_097f,
 	.class_tid = 3,
-	.hdr_sig_id = 1,
+	.hdr_sig_id = 30,
 	.flow_sig_id = 24580UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -36638,15 +36638,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_1_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_1_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_30_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_30_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_30_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_30_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1573] = {
 	.class_hid = BNXT_ULP_CLASS_HID_81ab8,
 	.class_tid = 3,
-	.hdr_sig_id = 2,
+	.hdr_sig_id = 31,
 	.flow_sig_id = 32768UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -36656,13 +36656,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_2_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_31_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_31_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1574] = {
 	.class_hid = BNXT_ULP_CLASS_HID_8020e,
 	.class_tid = 3,
-	.hdr_sig_id = 2,
+	.hdr_sig_id = 31,
 	.flow_sig_id = 32772UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -36672,14 +36672,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_2_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_31_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_31_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_31_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1575] = {
 	.class_hid = BNXT_ULP_CLASS_HID_815d8,
 	.class_tid = 3,
-	.hdr_sig_id = 2,
+	.hdr_sig_id = 31,
 	.flow_sig_id = 32832UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -36689,14 +36689,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_2_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_2_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_31_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_31_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_31_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1576] = {
 	.class_hid = BNXT_ULP_CLASS_HID_81cae,
 	.class_tid = 3,
-	.hdr_sig_id = 2,
+	.hdr_sig_id = 31,
 	.flow_sig_id = 32836UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -36706,15 +36706,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_2_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_2_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_31_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_31_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_31_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_31_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1577] = {
 	.class_hid = BNXT_ULP_CLASS_HID_810a8,
 	.class_tid = 3,
-	.hdr_sig_id = 2,
+	.hdr_sig_id = 31,
 	.flow_sig_id = 49152UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -36724,14 +36724,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_2_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_2_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_31_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_31_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_31_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1578] = {
 	.class_hid = BNXT_ULP_CLASS_HID_8183e,
 	.class_tid = 3,
-	.hdr_sig_id = 2,
+	.hdr_sig_id = 31,
 	.flow_sig_id = 49156UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -36741,15 +36741,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_2_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_2_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_31_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_31_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_31_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_31_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1579] = {
 	.class_hid = BNXT_ULP_CLASS_HID_8036a,
 	.class_tid = 3,
-	.hdr_sig_id = 2,
+	.hdr_sig_id = 31,
 	.flow_sig_id = 49216UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -36759,15 +36759,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_2_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_2_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_2_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_31_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_31_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_31_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_31_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1580] = {
 	.class_hid = BNXT_ULP_CLASS_HID_80af8,
 	.class_tid = 3,
-	.hdr_sig_id = 2,
+	.hdr_sig_id = 31,
 	.flow_sig_id = 49220UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -36777,16 +36777,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_2_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_2_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_2_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_31_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_31_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_31_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_31_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_31_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1581] = {
 	.class_hid = BNXT_ULP_CLASS_HID_206fe,
 	.class_tid = 3,
-	.hdr_sig_id = 3,
+	.hdr_sig_id = 32,
 	.flow_sig_id = 131072UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -36796,13 +36796,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_3_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_3_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_32_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_32_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1582] = {
 	.class_hid = BNXT_ULP_CLASS_HID_20e4c,
 	.class_tid = 3,
-	.hdr_sig_id = 3,
+	.hdr_sig_id = 32,
 	.flow_sig_id = 131076UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -36812,14 +36812,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_3_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_3_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_3_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_32_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_32_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_32_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1583] = {
 	.class_hid = BNXT_ULP_CLASS_HID_2111e,
 	.class_tid = 3,
-	.hdr_sig_id = 3,
+	.hdr_sig_id = 32,
 	.flow_sig_id = 131136UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -36829,14 +36829,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_3_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_3_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_3_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_32_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_32_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_32_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1584] = {
 	.class_hid = BNXT_ULP_CLASS_HID_218ec,
 	.class_tid = 3,
-	.hdr_sig_id = 3,
+	.hdr_sig_id = 32,
 	.flow_sig_id = 131140UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -36846,15 +36846,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_3_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_3_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_3_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_3_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_32_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_32_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_32_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_32_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1585] = {
 	.class_hid = BNXT_ULP_CLASS_HID_60472,
 	.class_tid = 3,
-	.hdr_sig_id = 3,
+	.hdr_sig_id = 32,
 	.flow_sig_id = 196608UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -36864,14 +36864,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_3_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_3_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_3_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_32_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_32_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_32_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1586] = {
 	.class_hid = BNXT_ULP_CLASS_HID_603c0,
 	.class_tid = 3,
-	.hdr_sig_id = 3,
+	.hdr_sig_id = 32,
 	.flow_sig_id = 196612UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -36881,15 +36881,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_3_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_3_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_3_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_3_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_32_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_32_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_32_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_32_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1587] = {
 	.class_hid = BNXT_ULP_CLASS_HID_61692,
 	.class_tid = 3,
-	.hdr_sig_id = 3,
+	.hdr_sig_id = 32,
 	.flow_sig_id = 196672UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -36899,15 +36899,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_3_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_3_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_3_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_3_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_32_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_32_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_32_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_32_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1588] = {
 	.class_hid = BNXT_ULP_CLASS_HID_61e60,
 	.class_tid = 3,
-	.hdr_sig_id = 3,
+	.hdr_sig_id = 32,
 	.flow_sig_id = 196676UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -36917,16 +36917,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_3_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_3_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_3_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_3_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_3_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_32_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_32_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_32_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_32_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_32_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1589] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1f81,
 	.class_tid = 3,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 33,
 	.flow_sig_id = 4096UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -36936,13 +36936,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_33_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1590] = {
 	.class_hid = BNXT_ULP_CLASS_HID_0773,
 	.class_tid = 3,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 33,
 	.flow_sig_id = 4100UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -36952,14 +36952,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_33_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1591] = {
 	.class_hid = BNXT_ULP_CLASS_HID_0f6b,
 	.class_tid = 3,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 33,
 	.flow_sig_id = 6144UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -36969,14 +36969,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_33_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1592] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16bf,
 	.class_tid = 3,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 33,
 	.flow_sig_id = 6148UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -36986,15 +36986,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_33_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1593] = {
 	.class_hid = BNXT_ULP_CLASS_HID_03cf,
 	.class_tid = 3,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 33,
 	.flow_sig_id = 12288UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37004,14 +37004,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_3_33_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_TCP_SRC_PORT }
 	},
 	[1594] = {
 	.class_hid = BNXT_ULP_CLASS_HID_0ab1,
 	.class_tid = 3,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 33,
 	.flow_sig_id = 12292UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37021,15 +37021,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_3_33_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_TCP_SRC_PORT }
 	},
 	[1595] = {
 	.class_hid = BNXT_ULP_CLASS_HID_130b,
 	.class_tid = 3,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 33,
 	.flow_sig_id = 14336UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37039,15 +37039,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_3_33_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_TCP_SRC_PORT }
 	},
 	[1596] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1afd,
 	.class_tid = 3,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 33,
 	.flow_sig_id = 14340UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37057,16 +37057,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_3_33_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_TCP_SRC_PORT }
 	},
 	[1597] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1591,
 	.class_tid = 3,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 33,
 	.flow_sig_id = 20480UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37076,14 +37076,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_33_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_TCP_DST_PORT }
 	},
 	[1598] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1d03,
 	.class_tid = 3,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 33,
 	.flow_sig_id = 20484UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37093,15 +37093,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_33_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_TCP_DST_PORT }
 	},
 	[1599] = {
 	.class_hid = BNXT_ULP_CLASS_HID_057b,
 	.class_tid = 3,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 33,
 	.flow_sig_id = 22528UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37111,15 +37111,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_33_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_TCP_DST_PORT }
 	},
 	[1600] = {
 	.class_hid = BNXT_ULP_CLASS_HID_0ced,
 	.class_tid = 3,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 33,
 	.flow_sig_id = 22532UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37129,16 +37129,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_33_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_TCP_DST_PORT }
 	},
 	[1601] = {
 	.class_hid = BNXT_ULP_CLASS_HID_19df,
 	.class_tid = 3,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 33,
 	.flow_sig_id = 28672UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37148,15 +37148,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_33_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_TCP_DST_PORT }
 	},
 	[1602] = {
 	.class_hid = BNXT_ULP_CLASS_HID_0141,
 	.class_tid = 3,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 33,
 	.flow_sig_id = 28676UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37166,16 +37166,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_33_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_TCP_DST_PORT }
 	},
 	[1603] = {
 	.class_hid = BNXT_ULP_CLASS_HID_08b9,
 	.class_tid = 3,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 33,
 	.flow_sig_id = 30720UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37185,16 +37185,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_33_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_TCP_DST_PORT }
 	},
 	[1604] = {
 	.class_hid = BNXT_ULP_CLASS_HID_108d,
 	.class_tid = 3,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 33,
 	.flow_sig_id = 30724UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37204,17 +37204,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_33_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_TCP_DST_PORT }
 	},
 	[1605] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1dbf,
 	.class_tid = 3,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 34,
 	.flow_sig_id = 16384UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37224,13 +37224,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_34_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1606] = {
 	.class_hid = BNXT_ULP_CLASS_HID_0529,
 	.class_tid = 3,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 34,
 	.flow_sig_id = 16388UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37240,14 +37240,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_34_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1607] = {
 	.class_hid = BNXT_ULP_CLASS_HID_01fd,
 	.class_tid = 3,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 34,
 	.flow_sig_id = 24576UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37257,14 +37257,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_34_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1608] = {
 	.class_hid = BNXT_ULP_CLASS_HID_096f,
 	.class_tid = 3,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 34,
 	.flow_sig_id = 24580UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37274,15 +37274,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_34_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1609] = {
 	.class_hid = BNXT_ULP_CLASS_HID_810b7,
 	.class_tid = 3,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 34,
 	.flow_sig_id = 49152UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37292,14 +37292,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_3_34_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_TCP_SRC_PORT }
 	},
 	[1610] = {
 	.class_hid = BNXT_ULP_CLASS_HID_81821,
 	.class_tid = 3,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 34,
 	.flow_sig_id = 49156UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37309,15 +37309,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_3_34_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_TCP_SRC_PORT }
 	},
 	[1611] = {
 	.class_hid = BNXT_ULP_CLASS_HID_804f5,
 	.class_tid = 3,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 34,
 	.flow_sig_id = 57344UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37327,15 +37327,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_3_34_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_TCP_SRC_PORT }
 	},
 	[1612] = {
 	.class_hid = BNXT_ULP_CLASS_HID_80c67,
 	.class_tid = 3,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 34,
 	.flow_sig_id = 57348UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37345,16 +37345,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_3_34_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_TCP_SRC_PORT }
 	},
 	[1613] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41333,
 	.class_tid = 3,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 34,
 	.flow_sig_id = 81920UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37364,14 +37364,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_34_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_TCP_DST_PORT }
 	},
 	[1614] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41aad,
 	.class_tid = 3,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 34,
 	.flow_sig_id = 81924UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37381,15 +37381,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_34_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_TCP_DST_PORT }
 	},
 	[1615] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40771,
 	.class_tid = 3,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 34,
 	.flow_sig_id = 90112UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37399,15 +37399,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_34_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_TCP_DST_PORT }
 	},
 	[1616] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40ee3,
 	.class_tid = 3,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 34,
 	.flow_sig_id = 90116UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37417,16 +37417,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_34_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_TCP_DST_PORT }
 	},
 	[1617] = {
 	.class_hid = BNXT_ULP_CLASS_HID_c16cb,
 	.class_tid = 3,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 34,
 	.flow_sig_id = 114688UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37436,15 +37436,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_34_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_TCP_DST_PORT }
 	},
 	[1618] = {
 	.class_hid = BNXT_ULP_CLASS_HID_c1da5,
 	.class_tid = 3,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 34,
 	.flow_sig_id = 114692UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37454,16 +37454,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_34_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_TCP_DST_PORT }
 	},
 	[1619] = {
 	.class_hid = BNXT_ULP_CLASS_HID_c1a09,
 	.class_tid = 3,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 34,
 	.flow_sig_id = 122880UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37473,16 +37473,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_34_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_TCP_DST_PORT }
 	},
 	[1620] = {
 	.class_hid = BNXT_ULP_CLASS_HID_c01fb,
 	.class_tid = 3,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 34,
 	.flow_sig_id = 122884UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37492,17 +37492,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_34_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_TCP_DST_PORT }
 	},
 	[1621] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1ff1,
 	.class_tid = 3,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 35,
 	.flow_sig_id = 4096UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37512,13 +37512,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_35_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1622] = {
 	.class_hid = BNXT_ULP_CLASS_HID_0703,
 	.class_tid = 3,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 35,
 	.flow_sig_id = 4100UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37528,14 +37528,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_35_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1623] = {
 	.class_hid = BNXT_ULP_CLASS_HID_0f1b,
 	.class_tid = 3,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 35,
 	.flow_sig_id = 6144UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37545,14 +37545,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_35_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1624] = {
 	.class_hid = BNXT_ULP_CLASS_HID_16cf,
 	.class_tid = 3,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 35,
 	.flow_sig_id = 6148UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37562,15 +37562,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_35_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1625] = {
 	.class_hid = BNXT_ULP_CLASS_HID_03bf,
 	.class_tid = 3,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 35,
 	.flow_sig_id = 12288UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37580,14 +37580,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_3_35_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_UDP_SRC_PORT }
 	},
 	[1626] = {
 	.class_hid = BNXT_ULP_CLASS_HID_0ac1,
 	.class_tid = 3,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 35,
 	.flow_sig_id = 12292UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37597,15 +37597,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_3_35_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_UDP_SRC_PORT }
 	},
 	[1627] = {
 	.class_hid = BNXT_ULP_CLASS_HID_137b,
 	.class_tid = 3,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 35,
 	.flow_sig_id = 14336UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37615,15 +37615,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_3_35_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_UDP_SRC_PORT }
 	},
 	[1628] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1a8d,
 	.class_tid = 3,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 35,
 	.flow_sig_id = 14340UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37633,16 +37633,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_3_35_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_UDP_SRC_PORT }
 	},
 	[1629] = {
 	.class_hid = BNXT_ULP_CLASS_HID_15e1,
 	.class_tid = 3,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 35,
 	.flow_sig_id = 20480UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37652,14 +37652,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_35_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_UDP_DST_PORT }
 	},
 	[1630] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1d73,
 	.class_tid = 3,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 35,
 	.flow_sig_id = 20484UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37669,15 +37669,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_35_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_UDP_DST_PORT }
 	},
 	[1631] = {
 	.class_hid = BNXT_ULP_CLASS_HID_050b,
 	.class_tid = 3,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 35,
 	.flow_sig_id = 22528UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37687,15 +37687,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_35_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_UDP_DST_PORT }
 	},
 	[1632] = {
 	.class_hid = BNXT_ULP_CLASS_HID_0c9d,
 	.class_tid = 3,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 35,
 	.flow_sig_id = 22532UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37705,16 +37705,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_35_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_UDP_DST_PORT }
 	},
 	[1633] = {
 	.class_hid = BNXT_ULP_CLASS_HID_19af,
 	.class_tid = 3,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 35,
 	.flow_sig_id = 28672UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37724,15 +37724,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_35_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_UDP_DST_PORT }
 	},
 	[1634] = {
 	.class_hid = BNXT_ULP_CLASS_HID_0131,
 	.class_tid = 3,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 35,
 	.flow_sig_id = 28676UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37742,16 +37742,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_35_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_UDP_DST_PORT }
 	},
 	[1635] = {
 	.class_hid = BNXT_ULP_CLASS_HID_08c9,
 	.class_tid = 3,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 35,
 	.flow_sig_id = 30720UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37761,16 +37761,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_35_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_UDP_DST_PORT }
 	},
 	[1636] = {
 	.class_hid = BNXT_ULP_CLASS_HID_10fd,
 	.class_tid = 3,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 35,
 	.flow_sig_id = 30724UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37780,17 +37780,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_35_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_UDP_DST_PORT }
 	},
 	[1637] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1dcf,
 	.class_tid = 3,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 36,
 	.flow_sig_id = 16384UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37800,13 +37800,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_36_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1638] = {
 	.class_hid = BNXT_ULP_CLASS_HID_0559,
 	.class_tid = 3,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 36,
 	.flow_sig_id = 16388UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37816,14 +37816,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_36_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1639] = {
 	.class_hid = BNXT_ULP_CLASS_HID_018d,
 	.class_tid = 3,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 36,
 	.flow_sig_id = 24576UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37833,14 +37833,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_36_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1640] = {
 	.class_hid = BNXT_ULP_CLASS_HID_091f,
 	.class_tid = 3,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 36,
 	.flow_sig_id = 24580UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37850,15 +37850,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_36_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1641] = {
 	.class_hid = BNXT_ULP_CLASS_HID_810c7,
 	.class_tid = 3,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 36,
 	.flow_sig_id = 49152UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37868,14 +37868,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_3_36_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_UDP_SRC_PORT }
 	},
 	[1642] = {
 	.class_hid = BNXT_ULP_CLASS_HID_81851,
 	.class_tid = 3,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 36,
 	.flow_sig_id = 49156UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37885,15 +37885,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_3_36_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_UDP_SRC_PORT }
 	},
 	[1643] = {
 	.class_hid = BNXT_ULP_CLASS_HID_80485,
 	.class_tid = 3,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 36,
 	.flow_sig_id = 57344UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37903,15 +37903,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_3_36_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_UDP_SRC_PORT }
 	},
 	[1644] = {
 	.class_hid = BNXT_ULP_CLASS_HID_80c17,
 	.class_tid = 3,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 36,
 	.flow_sig_id = 57348UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37921,16 +37921,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_3_36_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_UDP_SRC_PORT }
 	},
 	[1645] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41343,
 	.class_tid = 3,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 36,
 	.flow_sig_id = 81920UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37940,14 +37940,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_36_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_UDP_DST_PORT }
 	},
 	[1646] = {
 	.class_hid = BNXT_ULP_CLASS_HID_41add,
 	.class_tid = 3,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 36,
 	.flow_sig_id = 81924UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37957,15 +37957,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_36_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_UDP_DST_PORT }
 	},
 	[1647] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40701,
 	.class_tid = 3,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 36,
 	.flow_sig_id = 90112UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37975,15 +37975,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_36_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_UDP_DST_PORT }
 	},
 	[1648] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40e93,
 	.class_tid = 3,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 36,
 	.flow_sig_id = 90116UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -37993,16 +37993,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_36_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_UDP_DST_PORT }
 	},
 	[1649] = {
 	.class_hid = BNXT_ULP_CLASS_HID_c16bb,
 	.class_tid = 3,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 36,
 	.flow_sig_id = 114688UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38012,15 +38012,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_36_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_UDP_DST_PORT }
 	},
 	[1650] = {
 	.class_hid = BNXT_ULP_CLASS_HID_c1dd5,
 	.class_tid = 3,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 36,
 	.flow_sig_id = 114692UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38030,16 +38030,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_36_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_UDP_DST_PORT }
 	},
 	[1651] = {
 	.class_hid = BNXT_ULP_CLASS_HID_c1a79,
 	.class_tid = 3,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 36,
 	.flow_sig_id = 122880UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38049,16 +38049,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_36_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_UDP_DST_PORT }
 	},
 	[1652] = {
 	.class_hid = BNXT_ULP_CLASS_HID_c018b,
 	.class_tid = 3,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 36,
 	.flow_sig_id = 122884UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38068,17 +38068,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_36_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_UDP_DST_PORT }
 	},
 	[1653] = {
 	.class_hid = BNXT_ULP_CLASS_HID_81aa8,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 32768UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38089,13 +38089,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1654] = {
 	.class_hid = BNXT_ULP_CLASS_HID_8021e,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 32772UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38106,14 +38106,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1655] = {
 	.class_hid = BNXT_ULP_CLASS_HID_815c8,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 32832UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38124,14 +38124,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1656] = {
 	.class_hid = BNXT_ULP_CLASS_HID_81cbe,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 32836UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38142,15 +38142,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1657] = {
 	.class_hid = BNXT_ULP_CLASS_HID_810b8,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 49152UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38161,14 +38161,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1658] = {
 	.class_hid = BNXT_ULP_CLASS_HID_8182e,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 49156UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38179,15 +38179,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1659] = {
 	.class_hid = BNXT_ULP_CLASS_HID_8037a,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 49216UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38198,15 +38198,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1660] = {
 	.class_hid = BNXT_ULP_CLASS_HID_80ae8,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 49220UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38217,16 +38217,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1661] = {
 	.class_hid = BNXT_ULP_CLASS_HID_c1834,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 98304UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38237,14 +38237,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_SRC_PORT }
 	},
 	[1662] = {
 	.class_hid = BNXT_ULP_CLASS_HID_c079a,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 98308UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38255,15 +38255,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_SRC_PORT }
 	},
 	[1663] = {
 	.class_hid = BNXT_ULP_CLASS_HID_c0af6,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 98368UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38274,15 +38274,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_SRC_PORT }
 	},
 	[1664] = {
 	.class_hid = BNXT_ULP_CLASS_HID_c123a,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 98372UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38293,16 +38293,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_SRC_PORT }
 	},
 	[1665] = {
 	.class_hid = BNXT_ULP_CLASS_HID_c16c4,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 114688UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38313,15 +38313,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_SRC_PORT }
 	},
 	[1666] = {
 	.class_hid = BNXT_ULP_CLASS_HID_c1daa,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 114692UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38332,16 +38332,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_SRC_PORT }
 	},
 	[1667] = {
 	.class_hid = BNXT_ULP_CLASS_HID_c0086,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 114752UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38352,16 +38352,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_SRC_PORT }
 	},
 	[1668] = {
 	.class_hid = BNXT_ULP_CLASS_HID_c0874,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 114756UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38372,17 +38372,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_SRC_PORT }
 	},
 	[1669] = {
 	.class_hid = BNXT_ULP_CLASS_HID_a19ea,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 163840UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38393,14 +38393,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_DST_PORT }
 	},
 	[1670] = {
 	.class_hid = BNXT_ULP_CLASS_HID_a0158,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 163844UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38411,15 +38411,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_DST_PORT }
 	},
 	[1671] = {
 	.class_hid = BNXT_ULP_CLASS_HID_a0bb4,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 163904UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38430,15 +38430,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_DST_PORT }
 	},
 	[1672] = {
 	.class_hid = BNXT_ULP_CLASS_HID_a13f8,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 163908UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38449,16 +38449,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_DST_PORT }
 	},
 	[1673] = {
 	.class_hid = BNXT_ULP_CLASS_HID_a17fa,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 180224UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38469,15 +38469,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_DST_PORT }
 	},
 	[1674] = {
 	.class_hid = BNXT_ULP_CLASS_HID_a1f68,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 180228UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38488,16 +38488,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_DST_PORT }
 	},
 	[1675] = {
 	.class_hid = BNXT_ULP_CLASS_HID_a0244,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 180288UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38508,16 +38508,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_DST_PORT }
 	},
 	[1676] = {
 	.class_hid = BNXT_ULP_CLASS_HID_a092a,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 180292UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38528,17 +38528,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_DST_PORT }
 	},
 	[1677] = {
 	.class_hid = BNXT_ULP_CLASS_HID_e1f76,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 229376UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38549,15 +38549,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_DST_PORT }
 	},
 	[1678] = {
 	.class_hid = BNXT_ULP_CLASS_HID_e06e4,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 229380UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38568,16 +38568,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_DST_PORT }
 	},
 	[1679] = {
 	.class_hid = BNXT_ULP_CLASS_HID_e0930,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 229440UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38588,16 +38588,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_DST_PORT }
 	},
 	[1680] = {
 	.class_hid = BNXT_ULP_CLASS_HID_e1104,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 229444UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38608,17 +38608,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_DST_PORT }
 	},
 	[1681] = {
 	.class_hid = BNXT_ULP_CLASS_HID_e1506,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 245760UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38629,16 +38629,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_DST_PORT }
 	},
 	[1682] = {
 	.class_hid = BNXT_ULP_CLASS_HID_e1cf4,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 245764UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38649,17 +38649,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_DST_PORT }
 	},
 	[1683] = {
 	.class_hid = BNXT_ULP_CLASS_HID_e07c0,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 245824UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38670,17 +38670,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_DST_PORT }
 	},
 	[1684] = {
 	.class_hid = BNXT_ULP_CLASS_HID_e0eb6,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 245828UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38691,18 +38691,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_DST_PORT }
 	},
 	[1685] = {
 	.class_hid = BNXT_ULP_CLASS_HID_206ee,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 131072UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38713,13 +38713,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1686] = {
 	.class_hid = BNXT_ULP_CLASS_HID_20e5c,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 131076UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38730,14 +38730,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1687] = {
 	.class_hid = BNXT_ULP_CLASS_HID_2110e,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 131136UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38748,14 +38748,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1688] = {
 	.class_hid = BNXT_ULP_CLASS_HID_218fc,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 131140UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38766,15 +38766,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1689] = {
 	.class_hid = BNXT_ULP_CLASS_HID_60462,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 196608UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38785,14 +38785,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1690] = {
 	.class_hid = BNXT_ULP_CLASS_HID_603d0,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 196612UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38803,15 +38803,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1691] = {
 	.class_hid = BNXT_ULP_CLASS_HID_61682,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 196672UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38822,15 +38822,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1692] = {
 	.class_hid = BNXT_ULP_CLASS_HID_61e70,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 196676UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38841,16 +38841,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1693] = {
 	.class_hid = BNXT_ULP_CLASS_HID_3167e,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 393216UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38861,14 +38861,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_SRC_PORT }
 	},
 	[1694] = {
 	.class_hid = BNXT_ULP_CLASS_HID_31dec,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 393220UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38879,15 +38879,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_SRC_PORT }
 	},
 	[1695] = {
 	.class_hid = BNXT_ULP_CLASS_HID_30030,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 393280UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38898,15 +38898,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_SRC_PORT }
 	},
 	[1696] = {
 	.class_hid = BNXT_ULP_CLASS_HID_30fae,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 393284UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38917,16 +38917,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_SRC_PORT }
 	},
 	[1697] = {
 	.class_hid = BNXT_ULP_CLASS_HID_70b14,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 458752UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38937,15 +38937,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_SRC_PORT }
 	},
 	[1698] = {
 	.class_hid = BNXT_ULP_CLASS_HID_71360,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 458756UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38956,16 +38956,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_SRC_PORT }
 	},
 	[1699] = {
 	.class_hid = BNXT_ULP_CLASS_HID_705b4,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 458816UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38976,16 +38976,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_SRC_PORT }
 	},
 	[1700] = {
 	.class_hid = BNXT_ULP_CLASS_HID_70d22,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 458820UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -38996,17 +38996,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_SRC_PORT }
 	},
 	[1701] = {
 	.class_hid = BNXT_ULP_CLASS_HID_29e26,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 655360UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39017,14 +39017,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_DST_PORT }
 	},
 	[1702] = {
 	.class_hid = BNXT_ULP_CLASS_HID_28594,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 655364UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39035,15 +39035,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_DST_PORT }
 	},
 	[1703] = {
 	.class_hid = BNXT_ULP_CLASS_HID_288f8,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 655424UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39054,15 +39054,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_DST_PORT }
 	},
 	[1704] = {
 	.class_hid = BNXT_ULP_CLASS_HID_29034,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 655428UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39073,16 +39073,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_DST_PORT }
 	},
 	[1705] = {
 	.class_hid = BNXT_ULP_CLASS_HID_693ba,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 720896UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39093,15 +39093,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_DST_PORT }
 	},
 	[1706] = {
 	.class_hid = BNXT_ULP_CLASS_HID_69b28,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 720900UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39112,16 +39112,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_DST_PORT }
 	},
 	[1707] = {
 	.class_hid = BNXT_ULP_CLASS_HID_68e7c,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 720960UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39132,16 +39132,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_DST_PORT }
 	},
 	[1708] = {
 	.class_hid = BNXT_ULP_CLASS_HID_69648,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 720964UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39152,17 +39152,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_DST_PORT }
 	},
 	[1709] = {
 	.class_hid = BNXT_ULP_CLASS_HID_38de8,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 917504UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39173,15 +39173,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_DST_PORT }
 	},
 	[1710] = {
 	.class_hid = BNXT_ULP_CLASS_HID_39524,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 917508UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39192,16 +39192,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_DST_PORT }
 	},
 	[1711] = {
 	.class_hid = BNXT_ULP_CLASS_HID_39808,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 917568UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39212,16 +39212,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_DST_PORT }
 	},
 	[1712] = {
 	.class_hid = BNXT_ULP_CLASS_HID_387e6,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 917572UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39232,17 +39232,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_DST_PORT }
 	},
 	[1713] = {
 	.class_hid = BNXT_ULP_CLASS_HID_7836c,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 983040UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39253,16 +39253,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_DST_PORT }
 	},
 	[1714] = {
 	.class_hid = BNXT_ULP_CLASS_HID_78ada,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 983044UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39273,17 +39273,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_DST_PORT }
 	},
 	[1715] = {
 	.class_hid = BNXT_ULP_CLASS_HID_79d8c,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 983104UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39294,17 +39294,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_DST_PORT }
 	},
 	[1716] = {
 	.class_hid = BNXT_ULP_CLASS_HID_7857a,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 983108UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39315,18 +39315,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_DST_PORT }
 	},
 	[1717] = {
 	.class_hid = BNXT_ULP_CLASS_HID_81ad8,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 32768UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39337,13 +39337,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1718] = {
 	.class_hid = BNXT_ULP_CLASS_HID_8026e,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 32772UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39354,14 +39354,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1719] = {
 	.class_hid = BNXT_ULP_CLASS_HID_815b8,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 32832UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39372,14 +39372,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1720] = {
 	.class_hid = BNXT_ULP_CLASS_HID_81cce,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 32836UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39390,15 +39390,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1721] = {
 	.class_hid = BNXT_ULP_CLASS_HID_810c8,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 49152UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39409,14 +39409,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1722] = {
 	.class_hid = BNXT_ULP_CLASS_HID_8185e,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 49156UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39427,15 +39427,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1723] = {
 	.class_hid = BNXT_ULP_CLASS_HID_8030a,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 49216UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39446,15 +39446,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1724] = {
 	.class_hid = BNXT_ULP_CLASS_HID_80a98,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 49220UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39465,16 +39465,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1725] = {
 	.class_hid = BNXT_ULP_CLASS_HID_c1844,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 98304UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39485,14 +39485,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_SRC_PORT }
 	},
 	[1726] = {
 	.class_hid = BNXT_ULP_CLASS_HID_c07ea,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 98308UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39503,15 +39503,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_SRC_PORT }
 	},
 	[1727] = {
 	.class_hid = BNXT_ULP_CLASS_HID_c0a86,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 98368UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39522,15 +39522,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_SRC_PORT }
 	},
 	[1728] = {
 	.class_hid = BNXT_ULP_CLASS_HID_c124a,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 98372UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39541,16 +39541,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_SRC_PORT }
 	},
 	[1729] = {
 	.class_hid = BNXT_ULP_CLASS_HID_c16b4,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 114688UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39561,15 +39561,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_SRC_PORT }
 	},
 	[1730] = {
 	.class_hid = BNXT_ULP_CLASS_HID_c1dda,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 114692UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39580,16 +39580,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_SRC_PORT }
 	},
 	[1731] = {
 	.class_hid = BNXT_ULP_CLASS_HID_c00f6,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 114752UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39600,16 +39600,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_SRC_PORT }
 	},
 	[1732] = {
 	.class_hid = BNXT_ULP_CLASS_HID_c0804,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 114756UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39620,17 +39620,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_SRC_PORT }
 	},
 	[1733] = {
 	.class_hid = BNXT_ULP_CLASS_HID_a199a,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 163840UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39641,14 +39641,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_DST_PORT }
 	},
 	[1734] = {
 	.class_hid = BNXT_ULP_CLASS_HID_a0128,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 163844UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39659,15 +39659,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_DST_PORT }
 	},
 	[1735] = {
 	.class_hid = BNXT_ULP_CLASS_HID_a0bc4,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 163904UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39678,15 +39678,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_DST_PORT }
 	},
 	[1736] = {
 	.class_hid = BNXT_ULP_CLASS_HID_a1388,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 163908UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39697,16 +39697,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_DST_PORT }
 	},
 	[1737] = {
 	.class_hid = BNXT_ULP_CLASS_HID_a178a,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 180224UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39717,15 +39717,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_DST_PORT }
 	},
 	[1738] = {
 	.class_hid = BNXT_ULP_CLASS_HID_a1f18,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 180228UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39736,16 +39736,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_DST_PORT }
 	},
 	[1739] = {
 	.class_hid = BNXT_ULP_CLASS_HID_a0234,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 180288UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39756,16 +39756,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_DST_PORT }
 	},
 	[1740] = {
 	.class_hid = BNXT_ULP_CLASS_HID_a095a,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 180292UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39776,17 +39776,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_DST_PORT }
 	},
 	[1741] = {
 	.class_hid = BNXT_ULP_CLASS_HID_e1f06,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 229376UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39797,15 +39797,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_DST_PORT }
 	},
 	[1742] = {
 	.class_hid = BNXT_ULP_CLASS_HID_e0694,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 229380UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39816,16 +39816,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_DST_PORT }
 	},
 	[1743] = {
 	.class_hid = BNXT_ULP_CLASS_HID_e0940,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 229440UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39836,16 +39836,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_DST_PORT }
 	},
 	[1744] = {
 	.class_hid = BNXT_ULP_CLASS_HID_e1174,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 229444UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39856,17 +39856,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_DST_PORT }
 	},
 	[1745] = {
 	.class_hid = BNXT_ULP_CLASS_HID_e1576,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 245760UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39877,16 +39877,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_DST_PORT }
 	},
 	[1746] = {
 	.class_hid = BNXT_ULP_CLASS_HID_e1c84,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 245764UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39897,17 +39897,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_DST_PORT }
 	},
 	[1747] = {
 	.class_hid = BNXT_ULP_CLASS_HID_e07b0,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 245824UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39918,17 +39918,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_DST_PORT }
 	},
 	[1748] = {
 	.class_hid = BNXT_ULP_CLASS_HID_e0ec6,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 245828UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39939,18 +39939,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_DST_PORT }
 	},
 	[1749] = {
 	.class_hid = BNXT_ULP_CLASS_HID_2069e,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 131072UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39961,13 +39961,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1750] = {
 	.class_hid = BNXT_ULP_CLASS_HID_20e2c,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 131076UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39978,14 +39978,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1751] = {
 	.class_hid = BNXT_ULP_CLASS_HID_2117e,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 131136UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -39996,14 +39996,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1752] = {
 	.class_hid = BNXT_ULP_CLASS_HID_2188c,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 131140UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -40014,15 +40014,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1753] = {
 	.class_hid = BNXT_ULP_CLASS_HID_60412,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 196608UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -40033,14 +40033,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1754] = {
 	.class_hid = BNXT_ULP_CLASS_HID_603a0,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 196612UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -40051,15 +40051,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1755] = {
 	.class_hid = BNXT_ULP_CLASS_HID_616f2,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 196672UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -40070,15 +40070,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1756] = {
 	.class_hid = BNXT_ULP_CLASS_HID_61e00,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 196676UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -40089,16 +40089,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1757] = {
 	.class_hid = BNXT_ULP_CLASS_HID_3160e,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 393216UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -40109,14 +40109,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_SRC_PORT }
 	},
 	[1758] = {
 	.class_hid = BNXT_ULP_CLASS_HID_31d9c,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 393220UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -40127,15 +40127,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_SRC_PORT }
 	},
 	[1759] = {
 	.class_hid = BNXT_ULP_CLASS_HID_30040,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 393280UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -40146,15 +40146,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_SRC_PORT }
 	},
 	[1760] = {
 	.class_hid = BNXT_ULP_CLASS_HID_30fde,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 393284UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -40165,16 +40165,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_SRC_PORT }
 	},
 	[1761] = {
 	.class_hid = BNXT_ULP_CLASS_HID_70b64,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 458752UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -40185,15 +40185,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_SRC_PORT }
 	},
 	[1762] = {
 	.class_hid = BNXT_ULP_CLASS_HID_71310,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 458756UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -40204,16 +40204,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_SRC_PORT }
 	},
 	[1763] = {
 	.class_hid = BNXT_ULP_CLASS_HID_705c4,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 458816UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -40224,16 +40224,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_SRC_PORT }
 	},
 	[1764] = {
 	.class_hid = BNXT_ULP_CLASS_HID_70d52,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 458820UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -40244,17 +40244,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_SRC_PORT }
 	},
 	[1765] = {
 	.class_hid = BNXT_ULP_CLASS_HID_29e56,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 655360UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -40265,14 +40265,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_DST_PORT }
 	},
 	[1766] = {
 	.class_hid = BNXT_ULP_CLASS_HID_285e4,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 655364UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -40283,15 +40283,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_DST_PORT }
 	},
 	[1767] = {
 	.class_hid = BNXT_ULP_CLASS_HID_28888,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 655424UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -40302,15 +40302,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_DST_PORT }
 	},
 	[1768] = {
 	.class_hid = BNXT_ULP_CLASS_HID_29044,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 655428UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -40321,16 +40321,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_DST_PORT }
 	},
 	[1769] = {
 	.class_hid = BNXT_ULP_CLASS_HID_693ca,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 720896UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -40341,15 +40341,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_DST_PORT }
 	},
 	[1770] = {
 	.class_hid = BNXT_ULP_CLASS_HID_69b58,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 720900UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -40360,16 +40360,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_DST_PORT }
 	},
 	[1771] = {
 	.class_hid = BNXT_ULP_CLASS_HID_68e0c,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 720960UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -40380,16 +40380,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_DST_PORT }
 	},
 	[1772] = {
 	.class_hid = BNXT_ULP_CLASS_HID_69638,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 720964UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -40400,17 +40400,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_DST_PORT }
 	},
 	[1773] = {
 	.class_hid = BNXT_ULP_CLASS_HID_38d98,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 917504UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -40421,15 +40421,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_DST_PORT }
 	},
 	[1774] = {
 	.class_hid = BNXT_ULP_CLASS_HID_39554,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 917508UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -40440,16 +40440,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_DST_PORT }
 	},
 	[1775] = {
 	.class_hid = BNXT_ULP_CLASS_HID_39878,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 917568UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -40460,16 +40460,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_DST_PORT }
 	},
 	[1776] = {
 	.class_hid = BNXT_ULP_CLASS_HID_38796,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 917572UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -40480,17 +40480,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_DST_PORT }
 	},
 	[1777] = {
 	.class_hid = BNXT_ULP_CLASS_HID_7831c,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 983040UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -40501,16 +40501,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_DST_PORT }
 	},
 	[1778] = {
 	.class_hid = BNXT_ULP_CLASS_HID_78aaa,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 983044UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -40521,17 +40521,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_DST_PORT }
 	},
 	[1779] = {
 	.class_hid = BNXT_ULP_CLASS_HID_79dfc,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 983104UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -40542,17 +40542,17 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_DST_PORT }
 	},
 	[1780] = {
 	.class_hid = BNXT_ULP_CLASS_HID_7850a,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 983108UL,
 	.flow_pattern_id = 0,
 	.app_sig = 0,
@@ -40563,18 +40563,18 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_DST_PORT }
 	},
 	[1781] = {
 	.class_hid = BNXT_ULP_CLASS_HID_03b7,
 	.class_tid = 3,
-	.hdr_sig_id = 0,
+	.hdr_sig_id = 29,
 	.flow_sig_id = 4096UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -40583,12 +40583,12 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_0_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_29_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1782] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13f3,
 	.class_tid = 3,
-	.hdr_sig_id = 0,
+	.hdr_sig_id = 29,
 	.flow_sig_id = 6144UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -40597,13 +40597,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_0_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_0_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_29_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_29_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1783] = {
 	.class_hid = BNXT_ULP_CLASS_HID_0255,
 	.class_tid = 3,
-	.hdr_sig_id = 1,
+	.hdr_sig_id = 30,
 	.flow_sig_id = 16384UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -40612,12 +40612,12 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_1_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_30_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1784] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1675,
 	.class_tid = 3,
-	.hdr_sig_id = 1,
+	.hdr_sig_id = 30,
 	.flow_sig_id = 24576UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -40626,13 +40626,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_1_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_1_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_30_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_30_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1785] = {
 	.class_hid = BNXT_ULP_CLASS_HID_80f52,
 	.class_tid = 3,
-	.hdr_sig_id = 2,
+	.hdr_sig_id = 31,
 	.flow_sig_id = 32768UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -40642,12 +40642,12 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_2_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_31_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1786] = {
 	.class_hid = BNXT_ULP_CLASS_HID_819f2,
 	.class_tid = 3,
-	.hdr_sig_id = 2,
+	.hdr_sig_id = 31,
 	.flow_sig_id = 32832UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -40657,13 +40657,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_2_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_2_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_31_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_31_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1787] = {
 	.class_hid = BNXT_ULP_CLASS_HID_80542,
 	.class_tid = 3,
-	.hdr_sig_id = 2,
+	.hdr_sig_id = 31,
 	.flow_sig_id = 49152UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -40673,13 +40673,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_2_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_2_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_31_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_31_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1788] = {
 	.class_hid = BNXT_ULP_CLASS_HID_817e2,
 	.class_tid = 3,
-	.hdr_sig_id = 2,
+	.hdr_sig_id = 31,
 	.flow_sig_id = 49216UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -40689,14 +40689,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_2_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_2_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_2_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_31_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_31_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_31_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1789] = {
 	.class_hid = BNXT_ULP_CLASS_HID_20a98,
 	.class_tid = 3,
-	.hdr_sig_id = 3,
+	.hdr_sig_id = 32,
 	.flow_sig_id = 131072UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -40706,12 +40706,12 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_3_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_32_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1790] = {
 	.class_hid = BNXT_ULP_CLASS_HID_20538,
 	.class_tid = 3,
-	.hdr_sig_id = 3,
+	.hdr_sig_id = 32,
 	.flow_sig_id = 131136UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -40721,13 +40721,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_3_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_3_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_32_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_32_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1791] = {
 	.class_hid = BNXT_ULP_CLASS_HID_6081c,
 	.class_tid = 3,
-	.hdr_sig_id = 3,
+	.hdr_sig_id = 32,
 	.flow_sig_id = 196608UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -40737,13 +40737,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_3_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_3_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_32_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_32_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1792] = {
 	.class_hid = BNXT_ULP_CLASS_HID_61abc,
 	.class_tid = 3,
-	.hdr_sig_id = 3,
+	.hdr_sig_id = 32,
 	.flow_sig_id = 196672UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -40753,14 +40753,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_3_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_3_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_3_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_32_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_32_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_32_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1793] = {
 	.class_hid = BNXT_ULP_CLASS_HID_03a7,
 	.class_tid = 3,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 33,
 	.flow_sig_id = 4096UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -40770,12 +40770,12 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_4_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_33_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1794] = {
 	.class_hid = BNXT_ULP_CLASS_HID_13e3,
 	.class_tid = 3,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 33,
 	.flow_sig_id = 6144UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -40785,13 +40785,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_33_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1795] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1047,
 	.class_tid = 3,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 33,
 	.flow_sig_id = 12288UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -40801,13 +40801,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_3_33_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_TCP_SRC_PORT }
 	},
 	[1796] = {
 	.class_hid = BNXT_ULP_CLASS_HID_0721,
 	.class_tid = 3,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 33,
 	.flow_sig_id = 14336UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -40817,14 +40817,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_3_33_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_TCP_SRC_PORT }
 	},
 	[1797] = {
 	.class_hid = BNXT_ULP_CLASS_HID_19b7,
 	.class_tid = 3,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 33,
 	.flow_sig_id = 20480UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -40834,13 +40834,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_33_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_TCP_DST_PORT }
 	},
 	[1798] = {
 	.class_hid = BNXT_ULP_CLASS_HID_0911,
 	.class_tid = 3,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 33,
 	.flow_sig_id = 22528UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -40850,14 +40850,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_33_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_TCP_DST_PORT }
 	},
 	[1799] = {
 	.class_hid = BNXT_ULP_CLASS_HID_0df5,
 	.class_tid = 3,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 33,
 	.flow_sig_id = 28672UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -40867,14 +40867,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_33_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_TCP_DST_PORT }
 	},
 	[1800] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1d31,
 	.class_tid = 3,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 33,
 	.flow_sig_id = 30720UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -40884,15 +40884,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_4_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_33_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_TCP_DST_PORT }
 	},
 	[1801] = {
 	.class_hid = BNXT_ULP_CLASS_HID_0245,
 	.class_tid = 3,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 34,
 	.flow_sig_id = 16384UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -40902,12 +40902,12 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_5_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_34_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1802] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1665,
 	.class_tid = 3,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 34,
 	.flow_sig_id = 24576UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -40917,13 +40917,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_5_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_34_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1803] = {
 	.class_hid = BNXT_ULP_CLASS_HID_8055d,
 	.class_tid = 3,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 34,
 	.flow_sig_id = 49152UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -40933,13 +40933,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_3_34_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_TCP_SRC_PORT }
 	},
 	[1804] = {
 	.class_hid = BNXT_ULP_CLASS_HID_80893,
 	.class_tid = 3,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 34,
 	.flow_sig_id = 57344UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -40949,14 +40949,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_5_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_3_34_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_TCP_SRC_PORT }
 	},
 	[1805] = {
 	.class_hid = BNXT_ULP_CLASS_HID_407d9,
 	.class_tid = 3,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 34,
 	.flow_sig_id = 81920UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -40966,13 +40966,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_34_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_TCP_DST_PORT }
 	},
 	[1806] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40b1f,
 	.class_tid = 3,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 34,
 	.flow_sig_id = 90112UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -40982,14 +40982,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_5_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_34_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_TCP_DST_PORT }
 	},
 	[1807] = {
 	.class_hid = BNXT_ULP_CLASS_HID_c1ad1,
 	.class_tid = 3,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 34,
 	.flow_sig_id = 114688UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -40999,14 +40999,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_34_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_TCP_DST_PORT }
 	},
 	[1808] = {
 	.class_hid = BNXT_ULP_CLASS_HID_c0e17,
 	.class_tid = 3,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 34,
 	.flow_sig_id = 122880UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41016,15 +41016,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_5_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_34_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_TCP_DST_PORT }
 	},
 	[1809] = {
 	.class_hid = BNXT_ULP_CLASS_HID_03d7,
 	.class_tid = 3,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 35,
 	.flow_sig_id = 4096UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41034,12 +41034,12 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_6_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_35_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1810] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1393,
 	.class_tid = 3,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 35,
 	.flow_sig_id = 6144UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41049,13 +41049,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_35_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1811] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1037,
 	.class_tid = 3,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 35,
 	.flow_sig_id = 12288UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41065,13 +41065,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_3_35_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_UDP_SRC_PORT }
 	},
 	[1812] = {
 	.class_hid = BNXT_ULP_CLASS_HID_0751,
 	.class_tid = 3,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 35,
 	.flow_sig_id = 14336UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41081,14 +41081,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_3_35_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_UDP_SRC_PORT }
 	},
 	[1813] = {
 	.class_hid = BNXT_ULP_CLASS_HID_19c7,
 	.class_tid = 3,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 35,
 	.flow_sig_id = 20480UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41098,13 +41098,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_35_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_UDP_DST_PORT }
 	},
 	[1814] = {
 	.class_hid = BNXT_ULP_CLASS_HID_0961,
 	.class_tid = 3,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 35,
 	.flow_sig_id = 22528UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41114,14 +41114,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_35_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_UDP_DST_PORT }
 	},
 	[1815] = {
 	.class_hid = BNXT_ULP_CLASS_HID_0d85,
 	.class_tid = 3,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 35,
 	.flow_sig_id = 28672UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41131,14 +41131,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_35_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_UDP_DST_PORT }
 	},
 	[1816] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1d41,
 	.class_tid = 3,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 35,
 	.flow_sig_id = 30720UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41148,15 +41148,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_6_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_35_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_UDP_DST_PORT }
 	},
 	[1817] = {
 	.class_hid = BNXT_ULP_CLASS_HID_0235,
 	.class_tid = 3,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 36,
 	.flow_sig_id = 16384UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41166,12 +41166,12 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_7_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_36_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1818] = {
 	.class_hid = BNXT_ULP_CLASS_HID_1615,
 	.class_tid = 3,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 36,
 	.flow_sig_id = 24576UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41181,13 +41181,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_36_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1819] = {
 	.class_hid = BNXT_ULP_CLASS_HID_8052d,
 	.class_tid = 3,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 36,
 	.flow_sig_id = 49152UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41197,13 +41197,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_3_36_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_UDP_SRC_PORT }
 	},
 	[1820] = {
 	.class_hid = BNXT_ULP_CLASS_HID_808e3,
 	.class_tid = 3,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 36,
 	.flow_sig_id = 57344UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41213,14 +41213,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_3_36_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_UDP_SRC_PORT }
 	},
 	[1821] = {
 	.class_hid = BNXT_ULP_CLASS_HID_407a9,
 	.class_tid = 3,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 36,
 	.flow_sig_id = 81920UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41230,13 +41230,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_36_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_UDP_DST_PORT }
 	},
 	[1822] = {
 	.class_hid = BNXT_ULP_CLASS_HID_40b6f,
 	.class_tid = 3,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 36,
 	.flow_sig_id = 90112UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41246,14 +41246,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_36_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_UDP_DST_PORT }
 	},
 	[1823] = {
 	.class_hid = BNXT_ULP_CLASS_HID_c1aa1,
 	.class_tid = 3,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 36,
 	.flow_sig_id = 114688UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41263,14 +41263,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_36_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_UDP_DST_PORT }
 	},
 	[1824] = {
 	.class_hid = BNXT_ULP_CLASS_HID_c0e67,
 	.class_tid = 3,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 36,
 	.flow_sig_id = 122880UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41280,15 +41280,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_7_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_36_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_UDP_DST_PORT }
 	},
 	[1825] = {
 	.class_hid = BNXT_ULP_CLASS_HID_80f42,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 32768UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41299,12 +41299,12 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1826] = {
 	.class_hid = BNXT_ULP_CLASS_HID_819e2,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 32832UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41315,13 +41315,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_37_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1827] = {
 	.class_hid = BNXT_ULP_CLASS_HID_80552,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 49152UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41332,13 +41332,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1828] = {
 	.class_hid = BNXT_ULP_CLASS_HID_817f2,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 49216UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41349,14 +41349,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_37_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1829] = {
 	.class_hid = BNXT_ULP_CLASS_HID_c0cce,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 98304UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41367,13 +41367,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_SRC_PORT }
 	},
 	[1830] = {
 	.class_hid = BNXT_ULP_CLASS_HID_c1f6e,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 98368UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41384,14 +41384,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_3_37_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_SRC_PORT }
 	},
 	[1831] = {
 	.class_hid = BNXT_ULP_CLASS_HID_c1ade,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 114688UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41402,14 +41402,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_SRC_PORT }
 	},
 	[1832] = {
 	.class_hid = BNXT_ULP_CLASS_HID_c157e,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 114752UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41420,15 +41420,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_3_37_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_SRC_PORT }
 	},
 	[1833] = {
 	.class_hid = BNXT_ULP_CLASS_HID_a0d8c,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 163840UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41439,13 +41439,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_DST_PORT }
 	},
 	[1834] = {
 	.class_hid = BNXT_ULP_CLASS_HID_a182c,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 163904UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41456,14 +41456,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_37_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_DST_PORT }
 	},
 	[1835] = {
 	.class_hid = BNXT_ULP_CLASS_HID_a1b9c,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 180224UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41474,14 +41474,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_DST_PORT }
 	},
 	[1836] = {
 	.class_hid = BNXT_ULP_CLASS_HID_a163c,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 180288UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41492,15 +41492,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_37_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_DST_PORT }
 	},
 	[1837] = {
 	.class_hid = BNXT_ULP_CLASS_HID_e0308,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 229376UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41511,14 +41511,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_DST_PORT }
 	},
 	[1838] = {
 	.class_hid = BNXT_ULP_CLASS_HID_e1da8,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 229440UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41529,15 +41529,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_37_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_DST_PORT }
 	},
 	[1839] = {
 	.class_hid = BNXT_ULP_CLASS_HID_e1918,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 245760UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41548,15 +41548,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_DST_PORT }
 	},
 	[1840] = {
 	.class_hid = BNXT_ULP_CLASS_HID_e0bda,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 245824UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41567,16 +41567,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_37_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_DST_PORT }
 	},
 	[1841] = {
 	.class_hid = BNXT_ULP_CLASS_HID_20a88,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 131072UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41587,12 +41587,12 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1842] = {
 	.class_hid = BNXT_ULP_CLASS_HID_20528,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 131136UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41603,13 +41603,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_38_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1843] = {
 	.class_hid = BNXT_ULP_CLASS_HID_6080c,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 196608UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41620,13 +41620,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1844] = {
 	.class_hid = BNXT_ULP_CLASS_HID_61aac,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 196672UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41637,14 +41637,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_38_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1845] = {
 	.class_hid = BNXT_ULP_CLASS_HID_31a18,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 393216UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41655,13 +41655,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_SRC_PORT }
 	},
 	[1846] = {
 	.class_hid = BNXT_ULP_CLASS_HID_314b8,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 393280UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41672,14 +41672,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_3_38_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_SRC_PORT }
 	},
 	[1847] = {
 	.class_hid = BNXT_ULP_CLASS_HID_71f9c,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 458752UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41690,14 +41690,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_SRC_PORT }
 	},
 	[1848] = {
 	.class_hid = BNXT_ULP_CLASS_HID_70a5e,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 458816UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41708,15 +41708,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_SRC_PORT }
+		BNXT_ULP_HF_0_3_38_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_SRC_PORT }
 	},
 	[1849] = {
 	.class_hid = BNXT_ULP_CLASS_HID_282c0,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 655360UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41727,13 +41727,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_DST_PORT }
 	},
 	[1850] = {
 	.class_hid = BNXT_ULP_CLASS_HID_29d60,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 655424UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41744,14 +41744,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_38_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_DST_PORT }
 	},
 	[1851] = {
 	.class_hid = BNXT_ULP_CLASS_HID_68044,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 720896UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41762,14 +41762,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_DST_PORT }
 	},
 	[1852] = {
 	.class_hid = BNXT_ULP_CLASS_HID_692e4,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 720960UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41780,15 +41780,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_38_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_DST_PORT }
 	},
 	[1853] = {
 	.class_hid = BNXT_ULP_CLASS_HID_39250,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 917504UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41799,14 +41799,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_DST_PORT }
 	},
 	[1854] = {
 	.class_hid = BNXT_ULP_CLASS_HID_38c12,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 917568UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41817,15 +41817,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_38_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_DST_PORT }
 	},
 	[1855] = {
 	.class_hid = BNXT_ULP_CLASS_HID_797d4,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 983040UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41836,15 +41836,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_DST_PORT }
 	},
 	[1856] = {
 	.class_hid = BNXT_ULP_CLASS_HID_78196,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 983104UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41855,16 +41855,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_SRC_PORT |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_DST_PORT }
+		BNXT_ULP_HF_0_3_38_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_SRC_PORT |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_DST_PORT }
 	},
 	[1857] = {
 	.class_hid = BNXT_ULP_CLASS_HID_80f32,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 32768UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41875,12 +41875,12 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1858] = {
 	.class_hid = BNXT_ULP_CLASS_HID_81992,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 32832UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41891,13 +41891,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_39_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1859] = {
 	.class_hid = BNXT_ULP_CLASS_HID_80522,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 49152UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41908,13 +41908,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1860] = {
 	.class_hid = BNXT_ULP_CLASS_HID_81782,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 49216UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41925,14 +41925,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR }
+		BNXT_ULP_HF_0_3_39_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR }
 	},
 	[1861] = {
 	.class_hid = BNXT_ULP_CLASS_HID_c0cbe,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 98304UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41943,13 +41943,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_SRC_PORT }
 	},
 	[1862] = {
 	.class_hid = BNXT_ULP_CLASS_HID_c1f1e,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 98368UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41960,14 +41960,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_3_39_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_SRC_PORT }
 	},
 	[1863] = {
 	.class_hid = BNXT_ULP_CLASS_HID_c1aae,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 114688UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41978,14 +41978,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_SRC_PORT }
 	},
 	[1864] = {
 	.class_hid = BNXT_ULP_CLASS_HID_c150e,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 114752UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -41996,15 +41996,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_3_39_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_SRC_PORT }
 	},
 	[1865] = {
 	.class_hid = BNXT_ULP_CLASS_HID_a0dfc,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 163840UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -42015,13 +42015,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_DST_PORT }
 	},
 	[1866] = {
 	.class_hid = BNXT_ULP_CLASS_HID_a185c,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 163904UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -42032,14 +42032,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_39_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_DST_PORT }
 	},
 	[1867] = {
 	.class_hid = BNXT_ULP_CLASS_HID_a1bec,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 180224UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -42050,14 +42050,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_DST_PORT }
 	},
 	[1868] = {
 	.class_hid = BNXT_ULP_CLASS_HID_a164c,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 180288UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -42068,15 +42068,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_39_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_DST_PORT }
 	},
 	[1869] = {
 	.class_hid = BNXT_ULP_CLASS_HID_e0378,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 229376UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -42087,14 +42087,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_DST_PORT }
 	},
 	[1870] = {
 	.class_hid = BNXT_ULP_CLASS_HID_e1dd8,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 229440UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -42105,15 +42105,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_39_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_DST_PORT }
 	},
 	[1871] = {
 	.class_hid = BNXT_ULP_CLASS_HID_e1968,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 245760UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -42124,15 +42124,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_DST_PORT }
 	},
 	[1872] = {
 	.class_hid = BNXT_ULP_CLASS_HID_e0baa,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 245824UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -42143,16 +42143,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_SRC_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_39_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_SRC_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_DST_PORT }
 	},
 	[1873] = {
 	.class_hid = BNXT_ULP_CLASS_HID_20af8,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 131072UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -42163,12 +42163,12 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1874] = {
 	.class_hid = BNXT_ULP_CLASS_HID_20558,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 131136UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -42179,13 +42179,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_40_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1875] = {
 	.class_hid = BNXT_ULP_CLASS_HID_6087c,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 196608UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -42196,13 +42196,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1876] = {
 	.class_hid = BNXT_ULP_CLASS_HID_61adc,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 196672UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -42213,14 +42213,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR }
+		BNXT_ULP_HF_0_3_40_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR }
 	},
 	[1877] = {
 	.class_hid = BNXT_ULP_CLASS_HID_31a68,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 393216UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -42231,13 +42231,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_SRC_PORT }
 	},
 	[1878] = {
 	.class_hid = BNXT_ULP_CLASS_HID_314c8,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 393280UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -42248,14 +42248,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_3_40_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_SRC_PORT }
 	},
 	[1879] = {
 	.class_hid = BNXT_ULP_CLASS_HID_71fec,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 458752UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -42266,14 +42266,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_SRC_PORT }
 	},
 	[1880] = {
 	.class_hid = BNXT_ULP_CLASS_HID_70a2e,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 458816UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -42284,15 +42284,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_SRC_PORT }
+		BNXT_ULP_HF_0_3_40_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_SRC_PORT }
 	},
 	[1881] = {
 	.class_hid = BNXT_ULP_CLASS_HID_282b0,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 655360UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -42303,13 +42303,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_DST_PORT }
 	},
 	[1882] = {
 	.class_hid = BNXT_ULP_CLASS_HID_29d10,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 655424UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -42320,14 +42320,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_40_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_DST_PORT }
 	},
 	[1883] = {
 	.class_hid = BNXT_ULP_CLASS_HID_68034,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 720896UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -42338,14 +42338,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_DST_PORT }
 	},
 	[1884] = {
 	.class_hid = BNXT_ULP_CLASS_HID_69294,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 720960UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -42356,15 +42356,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_40_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_DST_PORT }
 	},
 	[1885] = {
 	.class_hid = BNXT_ULP_CLASS_HID_39220,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 917504UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -42375,14 +42375,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_DST_PORT }
 	},
 	[1886] = {
 	.class_hid = BNXT_ULP_CLASS_HID_38c62,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 917568UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -42393,15 +42393,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_40_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_DST_PORT }
 	},
 	[1887] = {
 	.class_hid = BNXT_ULP_CLASS_HID_797a4,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 983040UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -42412,15 +42412,15 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_DST_PORT }
 	},
 	[1888] = {
 	.class_hid = BNXT_ULP_CLASS_HID_781e6,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 983104UL,
 	.flow_pattern_id = 1,
 	.app_sig = 0,
@@ -42431,16 +42431,16 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_OO_VLAN_VID |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_SRC_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_SRC_PORT |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_DST_PORT }
+		BNXT_ULP_HF_0_3_40_BITMASK_OO_VLAN_VID |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_SRC_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_SRC_PORT |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_DST_PORT }
 	},
 	[1889] = {
 	.class_hid = BNXT_ULP_CLASS_HID_0f05,
 	.class_tid = 3,
-	.hdr_sig_id = 0,
+	.hdr_sig_id = 29,
 	.flow_sig_id = 4UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -42449,13 +42449,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_0_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_0_BITMASK_O_ETH_SMAC }
+		BNXT_ULP_HF_0_3_29_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_29_BITMASK_O_ETH_SMAC }
 	},
 	[1890] = {
 	.class_hid = BNXT_ULP_CLASS_HID_0f09,
 	.class_tid = 3,
-	.hdr_sig_id = 1,
+	.hdr_sig_id = 30,
 	.flow_sig_id = 4UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -42464,13 +42464,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_1_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_1_BITMASK_O_ETH_SMAC }
+		BNXT_ULP_HF_0_3_30_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_30_BITMASK_O_ETH_SMAC }
 	},
 	[1891] = {
 	.class_hid = BNXT_ULP_CLASS_HID_0f06,
 	.class_tid = 3,
-	.hdr_sig_id = 2,
+	.hdr_sig_id = 31,
 	.flow_sig_id = 4UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -42480,13 +42480,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_2_BITMASK_O_ETH_SMAC }
+		BNXT_ULP_HF_0_3_31_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_31_BITMASK_O_ETH_SMAC }
 	},
 	[1892] = {
 	.class_hid = BNXT_ULP_CLASS_HID_19a6,
 	.class_tid = 3,
-	.hdr_sig_id = 2,
+	.hdr_sig_id = 31,
 	.flow_sig_id = 68UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -42496,14 +42496,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_IPV6 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_2_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_2_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_2_BITMASK_OO_VLAN_VID }
+		BNXT_ULP_HF_0_3_31_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_31_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_31_BITMASK_OO_VLAN_VID }
 	},
 	[1893] = {
 	.class_hid = BNXT_ULP_CLASS_HID_0f0a,
 	.class_tid = 3,
-	.hdr_sig_id = 3,
+	.hdr_sig_id = 32,
 	.flow_sig_id = 4UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -42513,13 +42513,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_3_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_3_BITMASK_O_ETH_SMAC }
+		BNXT_ULP_HF_0_3_32_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_32_BITMASK_O_ETH_SMAC }
 	},
 	[1894] = {
 	.class_hid = BNXT_ULP_CLASS_HID_19aa,
 	.class_tid = 3,
-	.hdr_sig_id = 3,
+	.hdr_sig_id = 32,
 	.flow_sig_id = 68UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -42529,14 +42529,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_IPV4 |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_3_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_3_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_3_BITMASK_OO_VLAN_VID }
+		BNXT_ULP_HF_0_3_32_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_32_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_32_BITMASK_OO_VLAN_VID }
 	},
 	[1895] = {
 	.class_hid = BNXT_ULP_CLASS_HID_0f15,
 	.class_tid = 3,
-	.hdr_sig_id = 4,
+	.hdr_sig_id = 33,
 	.flow_sig_id = 4UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -42546,13 +42546,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_4_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_4_BITMASK_O_ETH_SMAC }
+		BNXT_ULP_HF_0_3_33_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_33_BITMASK_O_ETH_SMAC }
 	},
 	[1896] = {
 	.class_hid = BNXT_ULP_CLASS_HID_0f19,
 	.class_tid = 3,
-	.hdr_sig_id = 5,
+	.hdr_sig_id = 34,
 	.flow_sig_id = 4UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -42562,13 +42562,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_5_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_5_BITMASK_O_ETH_SMAC }
+		BNXT_ULP_HF_0_3_34_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_34_BITMASK_O_ETH_SMAC }
 	},
 	[1897] = {
 	.class_hid = BNXT_ULP_CLASS_HID_0f65,
 	.class_tid = 3,
-	.hdr_sig_id = 6,
+	.hdr_sig_id = 35,
 	.flow_sig_id = 4UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -42578,13 +42578,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_6_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_6_BITMASK_O_ETH_SMAC }
+		BNXT_ULP_HF_0_3_35_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_35_BITMASK_O_ETH_SMAC }
 	},
 	[1898] = {
 	.class_hid = BNXT_ULP_CLASS_HID_0f69,
 	.class_tid = 3,
-	.hdr_sig_id = 7,
+	.hdr_sig_id = 36,
 	.flow_sig_id = 4UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -42594,13 +42594,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_7_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_7_BITMASK_O_ETH_SMAC }
+		BNXT_ULP_HF_0_3_36_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_36_BITMASK_O_ETH_SMAC }
 	},
 	[1899] = {
 	.class_hid = BNXT_ULP_CLASS_HID_0f16,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 4UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -42611,13 +42611,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_SMAC }
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_SMAC }
 	},
 	[1900] = {
 	.class_hid = BNXT_ULP_CLASS_HID_19b6,
 	.class_tid = 3,
-	.hdr_sig_id = 8,
+	.hdr_sig_id = 37,
 	.flow_sig_id = 68UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -42628,14 +42628,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_8_BITMASK_OO_VLAN_VID }
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_37_BITMASK_OO_VLAN_VID }
 	},
 	[1901] = {
 	.class_hid = BNXT_ULP_CLASS_HID_0f1a,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 4UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -42646,13 +42646,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_SMAC }
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_SMAC }
 	},
 	[1902] = {
 	.class_hid = BNXT_ULP_CLASS_HID_19ba,
 	.class_tid = 3,
-	.hdr_sig_id = 9,
+	.hdr_sig_id = 38,
 	.flow_sig_id = 68UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -42663,14 +42663,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_TCP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_9_BITMASK_OO_VLAN_VID }
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_38_BITMASK_OO_VLAN_VID }
 	},
 	[1903] = {
 	.class_hid = BNXT_ULP_CLASS_HID_0f66,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 4UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -42681,13 +42681,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_SMAC }
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_SMAC }
 	},
 	[1904] = {
 	.class_hid = BNXT_ULP_CLASS_HID_19c6,
 	.class_tid = 3,
-	.hdr_sig_id = 10,
+	.hdr_sig_id = 39,
 	.flow_sig_id = 68UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -42698,14 +42698,14 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_10_BITMASK_OO_VLAN_VID }
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_39_BITMASK_OO_VLAN_VID }
 	},
 	[1905] = {
 	.class_hid = BNXT_ULP_CLASS_HID_0f6a,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 4UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -42716,13 +42716,13 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_SMAC }
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_SMAC }
 	},
 	[1906] = {
 	.class_hid = BNXT_ULP_CLASS_HID_19ca,
 	.class_tid = 3,
-	.hdr_sig_id = 11,
+	.hdr_sig_id = 40,
 	.flow_sig_id = 68UL,
 	.flow_pattern_id = 2,
 	.app_sig = 0,
@@ -42733,8 +42733,9 @@ struct bnxt_ulp_class_match_info ulp_class_match_list[] = {
 		BNXT_ULP_HDR_BIT_O_UDP |
 		BNXT_ULP_FLOW_DIR_BITMASK_EGR },
 	.field_sig = { .bits =
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_DMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_SMAC |
-		BNXT_ULP_HF_0_3_11_BITMASK_OO_VLAN_VID }
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_DMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_SMAC |
+		BNXT_ULP_HF_0_3_40_BITMASK_OO_VLAN_VID }
 	}
 };
+
diff --git a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_enum.h b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_enum.h
index 9ad25dbdb6..ad42c12887 100644
--- a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_enum.h
+++ b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_enum.h
@@ -1,15 +1,15 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2014-2023 Broadcom
+ * Copyright(c) 2014-2024 Broadcom
  * All rights reserved.
  */
 
 #ifndef ULP_TEMPLATE_DB_H_
 #define ULP_TEMPLATE_DB_H_
 
-#define BNXT_ULP_REGFILE_MAX_SZ 61
+#define BNXT_ULP_REGFILE_MAX_SZ 67
 #define BNXT_ULP_MAX_NUM_DEVICES 4
 #define BNXT_ULP_LOG2_MAX_NUM_DEV 2
-#define BNXT_ULP_GEN_TBL_MAX_SZ 36
+#define BNXT_ULP_GEN_TBL_MAX_SZ 40
 #define BNXT_ULP_CLASS_SIG_TBL_MAX_SZ 1048576
 #define BNXT_ULP_CLASS_MATCH_LIST_MAX_SZ 1907
 #define BNXT_ULP_CLASS_HID_LOW_PRIME 4049
@@ -17,49 +17,50 @@
 #define BNXT_ULP_CLASS_HID_SHFTR 29
 #define BNXT_ULP_CLASS_HID_SHFTL 28
 #define BNXT_ULP_CLASS_HID_MASK 1048575
-#define BNXT_ULP_ACT_SIG_TBL_MAX_SZ 32768
-#define BNXT_ULP_ACT_MATCH_LIST_MAX_SZ 546
+#define BNXT_ULP_ACT_SIG_TBL_MAX_SZ 262144
+#define BNXT_ULP_ACT_MATCH_LIST_MAX_SZ 724
 #define BNXT_ULP_ACT_HID_LOW_PRIME 7919
 #define BNXT_ULP_ACT_HID_HIGH_PRIME 7919
 #define BNXT_ULP_ACT_HID_SHFTR 25
-#define BNXT_ULP_ACT_HID_SHFTL 27
-#define BNXT_ULP_ACT_HID_MASK 32767
-#define BNXT_ULP_APP_RESOURCE_RESV_LIST_MAX_SZ 46
-#define BNXT_ULP_GLB_RESOURCE_TBL_MAX_SZ 537
-#define BNXT_ULP_APP_GLB_RESOURCE_TBL_MAX_SZ 187
-#define BNXT_ULP_RESOURCE_RESV_LIST_MAX_SZ 970
-#define BNXT_ULP_APP_CAP_TBL_MAX_SZ 25
+#define BNXT_ULP_ACT_HID_SHFTL 30
+#define BNXT_ULP_ACT_HID_MASK 262143
+#define BNXT_ULP_APP_RESOURCE_RESV_LIST_MAX_SZ 0
+#define BNXT_ULP_GLB_RESOURCE_TBL_MAX_SZ 51
+#define BNXT_ULP_APP_GLB_RESOURCE_TBL_MAX_SZ 0
+#define BNXT_ULP_RESOURCE_RESV_LIST_MAX_SZ 73
+#define BNXT_ULP_APP_CAP_TBL_MAX_SZ 2
 #define BNXT_ULP_COND_GOTO_REJECT 1023
 #define BNXT_ULP_COND_GOTO_RF 0x10000
 #define BNXT_ULP_GLB_FIELD_TBL_SHIFT 7
-#define BNXT_ULP_HDR_SIG_ID_SHIFT 5
+#define BNXT_ULP_HDR_SIG_ID_SHIFT 6
 #define BNXT_ULP_APP_ID_CONFIG 0
 #define BNXT_ULP_APP_ID_SHIFT 4
-#define BNXT_ULP_GLB_FIELD_TBL_SIZE 13805
+#define BNXT_ULP_GLB_FIELD_TBL_SIZE 29805
+#define BNXT_ULP_GLB_SIG_TBL_SIZE 1
 #define ULP_WH_PLUS_CLASS_TMPL_LIST_SIZE 6
-#define ULP_WH_PLUS_CLASS_TBL_LIST_SIZE 89
-#define ULP_WH_PLUS_CLASS_KEY_INFO_LIST_SIZE 606
-#define ULP_WH_PLUS_CLASS_IDENT_LIST_SIZE 26
-#define ULP_WH_PLUS_CLASS_RESULT_FIELD_LIST_SIZE 618
+#define ULP_WH_PLUS_CLASS_TBL_LIST_SIZE 94
+#define ULP_WH_PLUS_CLASS_KEY_INFO_LIST_SIZE 690
+#define ULP_WH_PLUS_CLASS_IDENT_LIST_SIZE 29
+#define ULP_WH_PLUS_CLASS_RESULT_FIELD_LIST_SIZE 664
 #define ULP_WH_PLUS_CLASS_COND_LIST_SIZE 49
 #define ULP_THOR_CLASS_TMPL_LIST_SIZE 6
 #define ULP_THOR_CLASS_TBL_LIST_SIZE 124
 #define ULP_THOR_CLASS_KEY_INFO_LIST_SIZE 2514
 #define ULP_THOR_CLASS_IDENT_LIST_SIZE 38
-#define ULP_THOR_CLASS_RESULT_FIELD_LIST_SIZE 1517
+#define ULP_THOR_CLASS_RESULT_FIELD_LIST_SIZE 1521
 #define ULP_THOR_CLASS_COND_LIST_SIZE 55
 #define ULP_WH_PLUS_ACT_TMPL_LIST_SIZE 11
-#define ULP_WH_PLUS_ACT_TBL_LIST_SIZE 46
-#define ULP_WH_PLUS_ACT_KEY_INFO_LIST_SIZE 2
-#define ULP_WH_PLUS_ACT_IDENT_LIST_SIZE 1
-#define ULP_WH_PLUS_ACT_RESULT_FIELD_LIST_SIZE 616
-#define ULP_WH_PLUS_ACT_COND_LIST_SIZE 65
+#define ULP_WH_PLUS_ACT_TBL_LIST_SIZE 154
+#define ULP_WH_PLUS_ACT_KEY_INFO_LIST_SIZE 45
+#define ULP_WH_PLUS_ACT_IDENT_LIST_SIZE 20
+#define ULP_WH_PLUS_ACT_RESULT_FIELD_LIST_SIZE 995
+#define ULP_WH_PLUS_ACT_COND_LIST_SIZE 121
 #define ULP_THOR_ACT_TMPL_LIST_SIZE 11
-#define ULP_THOR_ACT_TBL_LIST_SIZE 96
-#define ULP_THOR_ACT_KEY_INFO_LIST_SIZE 34
-#define ULP_THOR_ACT_IDENT_LIST_SIZE 19
-#define ULP_THOR_ACT_RESULT_FIELD_LIST_SIZE 794
-#define ULP_THOR_ACT_COND_LIST_SIZE 75
+#define ULP_THOR_ACT_TBL_LIST_SIZE 101
+#define ULP_THOR_ACT_KEY_INFO_LIST_SIZE 48
+#define ULP_THOR_ACT_IDENT_LIST_SIZE 21
+#define ULP_THOR_ACT_RESULT_FIELD_LIST_SIZE 798
+#define ULP_THOR_ACT_COND_LIST_SIZE 89
 
 enum bnxt_ulp_act_bit {
 	BNXT_ULP_ACT_BIT_MARK                = 0x0000000000000001,
@@ -100,7 +101,8 @@ enum bnxt_ulp_act_bit {
 	BNXT_ULP_ACT_BIT_IP_DECAP            = 0x0000000800000000,
 	BNXT_ULP_ACT_BIT_L2_ENCAP            = 0x0000001000000000,
 	BNXT_ULP_ACT_BIT_L2_DECAP            = 0x0000002000000000,
-	BNXT_ULP_ACT_BIT_LAST                = 0x0000004000000000
+	BNXT_ULP_ACT_BIT_MULTIPLE_PORT       = 0x0000004000000000,
+	BNXT_ULP_ACT_BIT_LAST                = 0x0000008000000000
 };
 
 enum bnxt_ulp_hdr_bit {
@@ -128,7 +130,8 @@ enum bnxt_ulp_hdr_bit {
 	BNXT_ULP_HDR_BIT_F2                  = 0x0000000000200000,
 	BNXT_ULP_HDR_BIT_SVIF_IGNORE         = 0x0000000000400000,
 	BNXT_ULP_HDR_BIT_O_SRV6              = 0x0000000000800000,
-	BNXT_ULP_HDR_BIT_LAST                = 0x0000000001000000
+	BNXT_ULP_HDR_BIT_T_VXLAN_GPE         = 0x0000000001000000,
+	BNXT_ULP_HDR_BIT_LAST                = 0x0000000002000000
 };
 
 enum bnxt_ulp_accept_opc {
@@ -237,7 +240,22 @@ enum bnxt_ulp_cf_idx {
 	BNXT_ULP_CF_IDX_SRV6_UPAR_ID = 83,
 	BNXT_ULP_CF_IDX_SRV6_T_ID = 84,
 	BNXT_ULP_CF_IDX_GENERIC_SIZE = 85,
-	BNXT_ULP_CF_IDX_LAST = 86
+	BNXT_ULP_CF_IDX_L2_CUSTOM_UPAR_ID = 86,
+	BNXT_ULP_CF_IDX_CUSTOM_GRE_EN = 87,
+	BNXT_ULP_CF_IDX_UPAR_HIGH_EN = 88,
+	BNXT_ULP_CF_IDX_MP_NPORTS = 89,
+	BNXT_ULP_CF_IDX_MP_PORT_A = 90,
+	BNXT_ULP_CF_IDX_MP_VNIC_A = 91,
+	BNXT_ULP_CF_IDX_MP_VPORT_A = 92,
+	BNXT_ULP_CF_IDX_MP_MDATA_A = 93,
+	BNXT_ULP_CF_IDX_MP_A_IS_VFREP = 94,
+	BNXT_ULP_CF_IDX_MP_PORT_B = 95,
+	BNXT_ULP_CF_IDX_MP_VNIC_B = 96,
+	BNXT_ULP_CF_IDX_MP_VPORT_B = 97,
+	BNXT_ULP_CF_IDX_MP_MDATA_B = 98,
+	BNXT_ULP_CF_IDX_MP_B_IS_VFREP = 99,
+	BNXT_ULP_CF_IDX_VXLAN_IP_UPAR_ID = 100,
+	BNXT_ULP_CF_IDX_LAST = 101
 };
 
 enum bnxt_ulp_cond_list_opc {
@@ -335,7 +353,12 @@ enum bnxt_ulp_enc_field {
 	BNXT_ULP_ENC_FIELD_SRV6_SEG_LIST3 = 36,
 	BNXT_ULP_ENC_FIELD_GENERIC_SIZE = 37,
 	BNXT_ULP_ENC_FIELD_GENERIC_RSVD = 38,
-	BNXT_ULP_ENC_FIELD_LAST = 39
+	BNXT_ULP_ENC_FIELD_VXLAN_GPE_FLAGS = 39,
+	BNXT_ULP_ENC_FIELD_VXLAN_GPE_RSVD0 = 40,
+	BNXT_ULP_ENC_FIELD_VXLAN_GPE_NEXT_PROTO = 41,
+	BNXT_ULP_ENC_FIELD_VXLAN_GPE_VNI = 42,
+	BNXT_ULP_ENC_FIELD_VXLAN_GPE_RSVD1 = 43,
+	BNXT_ULP_ENC_FIELD_LAST = 44
 };
 
 enum bnxt_ulp_fdb_opc {
@@ -406,7 +429,9 @@ enum bnxt_ulp_func_opc {
 	BNXT_ULP_FUNC_OPC_ALLOC_L2_CTX_ID = 10,
 	BNXT_ULP_FUNC_OPC_TUNNEL_DST_PORT_ALLOC = 11,
 	BNXT_ULP_FUNC_OPC_TUNNEL_DST_PORT_FREE = 12,
-	BNXT_ULP_FUNC_OPC_LAST = 13
+	BNXT_ULP_FUNC_OPC_ADD = 13,
+	BNXT_ULP_FUNC_OPC_SUB = 14,
+	BNXT_ULP_FUNC_OPC_LAST = 15
 };
 
 enum bnxt_ulp_func_src {
@@ -491,37 +516,39 @@ enum bnxt_ulp_glb_rf_idx {
 	BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_1 = 57,
 	BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_2 = 58,
 	BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_3 = 59,
-	BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0 = 60,
-	BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1 = 61,
-	BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_2 = 62,
-	BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_3 = 63,
-	BNXT_ULP_GLB_RF_IDX_APP_GLB_EM_PROFILE_ID_0 = 64,
-	BNXT_ULP_GLB_RF_IDX_APP_GLB_EM_PROFILE_ID_1 = 65,
-	BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0 = 66,
-	BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_1 = 67,
-	BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_2 = 68,
-	BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_3 = 69,
-	BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_4 = 70,
-	BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_5 = 71,
-	BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_6 = 72,
-	BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_7 = 73,
-	BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_8 = 74,
-	BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_9 = 75,
-	BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_10 = 76,
-	BNXT_ULP_GLB_RF_IDX_APP_GLB_EM_KEY_ID_0 = 77,
-	BNXT_ULP_GLB_RF_IDX_APP_GLB_EM_KEY_ID_1 = 78,
-	BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_0 = 79,
-	BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_1 = 80,
-	BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_2 = 81,
-	BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_3 = 82,
-	BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_4 = 83,
-	BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_0 = 84,
-	BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_1 = 85,
-	BNXT_ULP_GLB_RF_IDX_GRE_PROF_FUNC_ID = 86,
-	BNXT_ULP_GLB_RF_IDX_RECYCLE_PROF_FUNC_ID = 87,
-	BNXT_ULP_GLB_RF_IDX_GLB_ECPRI_UPAR_ID = 88,
-	BNXT_ULP_GLB_RF_IDX_GLB_ECPRI_PROF_FUNC_ID = 89,
-	BNXT_ULP_GLB_RF_IDX_LAST = 90
+	BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_4 = 60,
+	BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0 = 61,
+	BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1 = 62,
+	BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_2 = 63,
+	BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_3 = 64,
+	BNXT_ULP_GLB_RF_IDX_APP_GLB_EM_PROFILE_ID_0 = 65,
+	BNXT_ULP_GLB_RF_IDX_APP_GLB_EM_PROFILE_ID_1 = 66,
+	BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0 = 67,
+	BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_1 = 68,
+	BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_2 = 69,
+	BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_3 = 70,
+	BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_4 = 71,
+	BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_5 = 72,
+	BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_6 = 73,
+	BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_7 = 74,
+	BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_8 = 75,
+	BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_9 = 76,
+	BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_10 = 77,
+	BNXT_ULP_GLB_RF_IDX_APP_GLB_EM_KEY_ID_0 = 78,
+	BNXT_ULP_GLB_RF_IDX_APP_GLB_EM_KEY_ID_1 = 79,
+	BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_0 = 80,
+	BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_1 = 81,
+	BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_2 = 82,
+	BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_3 = 83,
+	BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_4 = 84,
+	BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_5 = 85,
+	BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_0 = 86,
+	BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_1 = 87,
+	BNXT_ULP_GLB_RF_IDX_GRE_PROF_FUNC_ID = 88,
+	BNXT_ULP_GLB_RF_IDX_RECYCLE_PROF_FUNC_ID = 89,
+	BNXT_ULP_GLB_RF_IDX_GLB_ECPRI_UPAR_ID = 90,
+	BNXT_ULP_GLB_RF_IDX_GLB_ECPRI_PROF_FUNC_ID = 91,
+	BNXT_ULP_GLB_RF_IDX_LAST = 92
 };
 
 enum bnxt_ulp_global_register_tbl_opc {
@@ -591,7 +618,8 @@ enum bnxt_ulp_port_table {
 	BNXT_ULP_PORT_TABLE_PHY_PORT_VPORT = 16,
 	BNXT_ULP_PORT_TABLE_PORT_IS_PF = 17,
 	BNXT_ULP_PORT_TABLE_VF_FUNC_METADATA = 18,
-	BNXT_ULP_PORT_TABLE_LAST = 19
+	BNXT_ULP_PORT_TABLE_VF_FUNC_FID = 19,
+	BNXT_ULP_PORT_TABLE_LAST = 20
 };
 
 enum bnxt_ulp_pri_opc {
@@ -621,58 +649,64 @@ enum bnxt_ulp_rf_idx {
 	BNXT_ULP_RF_IDX_WC_PROFILE_ID_0 = 7,
 	BNXT_ULP_RF_IDX_WC_PROFILE_ID_1 = 8,
 	BNXT_ULP_RF_IDX_MAIN_ACTION_PTR = 9,
-	BNXT_ULP_RF_IDX_ACTION_PTR_0 = 10,
-	BNXT_ULP_RF_IDX_ENCAP_PTR_0 = 11,
-	BNXT_ULP_RF_IDX_ENCAP_PTR_1 = 12,
-	BNXT_ULP_RF_IDX_CRITICAL_RESOURCE = 13,
-	BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 = 14,
-	BNXT_ULP_RF_IDX_MAIN_SP_PTR = 15,
-	BNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 = 16,
-	BNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 = 17,
-	BNXT_ULP_RF_IDX_ACTION_REC_SIZE = 18,
-	BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0 = 19,
-	BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_1 = 20,
-	BNXT_ULP_RF_IDX_PROFILE_TCAM_INDEX_0 = 21,
-	BNXT_ULP_RF_IDX_PROFILE_TCAM_INDEX_1 = 22,
-	BNXT_ULP_RF_IDX_WC_TCAM_INDEX_0 = 23,
-	BNXT_ULP_RF_IDX_WC_TCAM_INDEX_1 = 24,
-	BNXT_ULP_RF_IDX_SRC_PROPERTY_PTR = 25,
-	BNXT_ULP_RF_IDX_GENERIC_TBL_MISS = 26,
-	BNXT_ULP_RF_IDX_MIRROR_PTR_0 = 27,
-	BNXT_ULP_RF_IDX_MIRROR_ID_0 = 28,
-	BNXT_ULP_RF_IDX_HDR_SIG_ID = 29,
-	BNXT_ULP_RF_IDX_FLOW_SIG_ID = 30,
-	BNXT_ULP_RF_IDX_RID = 31,
-	BNXT_ULP_RF_IDX_WC_KEY_ID_0 = 32,
-	BNXT_ULP_RF_IDX_EM_KEY_ID_0 = 33,
-	BNXT_ULP_RF_IDX_DRV_FUNC_MAC = 34,
-	BNXT_ULP_RF_IDX_DRV_FUNC_PARENT_MAC = 35,
-	BNXT_ULP_RF_IDX_DEFAULT_AREC_PTR = 36,
-	BNXT_ULP_RF_IDX_CC = 37,
-	BNXT_ULP_RF_IDX_CF_FLOW_SIG_ID = 38,
-	BNXT_ULP_RF_IDX_PHY_PORT = 39,
-	BNXT_ULP_RF_IDX_METADATA_PROF = 40,
-	BNXT_ULP_RF_IDX_MODIFY_PTR = 41,
-	BNXT_ULP_RF_IDX_SOCK_DIR_SVIF = 42,
-	BNXT_ULP_RF_IDX_SOCK_DIR_PARIF = 43,
-	BNXT_ULP_RF_IDX_SOCK_DIR_ACT_PTR = 44,
-	BNXT_ULP_RF_IDX_SOCK_DIR_PARENT_MAC = 45,
-	BNXT_ULP_RF_IDX_RSS_VNIC = 46,
-	BNXT_ULP_RF_IDX_PORT_IS_PF = 47,
-	BNXT_ULP_RF_IDX_METER_PROFILE_PTR_0 = 48,
-	BNXT_ULP_RF_IDX_METER_PTR_0 = 49,
-	BNXT_ULP_RF_IDX_REF_CNT = 50,
-	BNXT_ULP_RF_IDX_RF_0 = 51,
-	BNXT_ULP_RF_IDX_RF_1 = 52,
-	BNXT_ULP_RF_IDX_RF_2 = 53,
-	BNXT_ULP_RF_IDX_RF_3 = 54,
-	BNXT_ULP_RF_IDX_RF_4 = 55,
-	BNXT_ULP_RF_IDX_RF_5 = 56,
-	BNXT_ULP_RF_IDX_RF_6 = 57,
-	BNXT_ULP_RF_IDX_RF_7 = 58,
-	BNXT_ULP_RF_IDX_VF_FUNC_METADATA = 59,
-	BNXT_ULP_RF_IDX_CHAIN_ID_METADATA = 60,
-	BNXT_ULP_RF_IDX_LAST = 61
+	BNXT_ULP_RF_IDX_MIRR_ACTION_PTR = 10,
+	BNXT_ULP_RF_IDX_ACTION_PTR_0 = 11,
+	BNXT_ULP_RF_IDX_ENCAP_PTR_0 = 12,
+	BNXT_ULP_RF_IDX_ENCAP_PTR_1 = 13,
+	BNXT_ULP_RF_IDX_MIRR_ENCAP_PTR_0 = 14,
+	BNXT_ULP_RF_IDX_CRITICAL_RESOURCE = 15,
+	BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 = 16,
+	BNXT_ULP_RF_IDX_MIRR_FLOW_CNTR_PTR_0 = 17,
+	BNXT_ULP_RF_IDX_MAIN_SP_PTR = 18,
+	BNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 = 19,
+	BNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 = 20,
+	BNXT_ULP_RF_IDX_ACTION_REC_SIZE = 21,
+	BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0 = 22,
+	BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_1 = 23,
+	BNXT_ULP_RF_IDX_PROFILE_TCAM_INDEX_0 = 24,
+	BNXT_ULP_RF_IDX_PROFILE_TCAM_INDEX_1 = 25,
+	BNXT_ULP_RF_IDX_WC_TCAM_INDEX_0 = 26,
+	BNXT_ULP_RF_IDX_WC_TCAM_INDEX_1 = 27,
+	BNXT_ULP_RF_IDX_SRC_PROPERTY_PTR = 28,
+	BNXT_ULP_RF_IDX_GENERIC_TBL_MISS = 29,
+	BNXT_ULP_RF_IDX_MIRROR_PTR_0 = 30,
+	BNXT_ULP_RF_IDX_MIRROR_ID_0 = 31,
+	BNXT_ULP_RF_IDX_HDR_SIG_ID = 32,
+	BNXT_ULP_RF_IDX_FLOW_SIG_ID = 33,
+	BNXT_ULP_RF_IDX_RID = 34,
+	BNXT_ULP_RF_IDX_WC_KEY_ID_0 = 35,
+	BNXT_ULP_RF_IDX_EM_KEY_ID_0 = 36,
+	BNXT_ULP_RF_IDX_DRV_FUNC_MAC = 37,
+	BNXT_ULP_RF_IDX_DRV_FUNC_PARENT_MAC = 38,
+	BNXT_ULP_RF_IDX_DEFAULT_AREC_PTR = 39,
+	BNXT_ULP_RF_IDX_CC = 40,
+	BNXT_ULP_RF_IDX_CF_FLOW_SIG_ID = 41,
+	BNXT_ULP_RF_IDX_PHY_PORT = 42,
+	BNXT_ULP_RF_IDX_METADATA_PROF = 43,
+	BNXT_ULP_RF_IDX_MODIFY_PTR = 44,
+	BNXT_ULP_RF_IDX_SOCK_DIR_SVIF = 45,
+	BNXT_ULP_RF_IDX_SOCK_DIR_PARIF = 46,
+	BNXT_ULP_RF_IDX_SOCK_DIR_ACT_PTR = 47,
+	BNXT_ULP_RF_IDX_SOCK_DIR_PARENT_MAC = 48,
+	BNXT_ULP_RF_IDX_RSS_VNIC = 49,
+	BNXT_ULP_RF_IDX_PORT_IS_PF = 50,
+	BNXT_ULP_RF_IDX_METER_PROFILE_PTR_0 = 51,
+	BNXT_ULP_RF_IDX_METER_PTR_0 = 52,
+	BNXT_ULP_RF_IDX_REF_CNT = 53,
+	BNXT_ULP_RF_IDX_RF_0 = 54,
+	BNXT_ULP_RF_IDX_RF_1 = 55,
+	BNXT_ULP_RF_IDX_RF_2 = 56,
+	BNXT_ULP_RF_IDX_RF_3 = 57,
+	BNXT_ULP_RF_IDX_RF_4 = 58,
+	BNXT_ULP_RF_IDX_RF_5 = 59,
+	BNXT_ULP_RF_IDX_RF_6 = 60,
+	BNXT_ULP_RF_IDX_RF_7 = 61,
+	BNXT_ULP_RF_IDX_VF_FUNC_METADATA = 62,
+	BNXT_ULP_RF_IDX_CHAIN_ID_METADATA = 63,
+	BNXT_ULP_RF_IDX_DEST_VNIC = 64,
+	BNXT_ULP_RF_IDX_DEST_VPORT = 65,
+	BNXT_ULP_RF_IDX_DEST_METADATA = 66,
+	BNXT_ULP_RF_IDX_LAST = 67
 };
 
 enum bnxt_ulp_tcam_tbl_opc {
@@ -706,7 +740,8 @@ enum bnxt_ulp_app_cap {
 	BNXT_ULP_APP_CAP_BC_MC_SUPPORT = 0x00000020,
 	BNXT_ULP_APP_CAP_CUST_VXLAN = 0x00000040,
 	BNXT_ULP_APP_CAP_HA_DYNAMIC = 0x00000080,
-	BNXT_ULP_APP_CAP_SRV6 = 0x00000100
+	BNXT_ULP_APP_CAP_SRV6 = 0x00000100,
+	BNXT_ULP_APP_CAP_L2_ETYPE = 0x00000200
 };
 
 enum bnxt_ulp_fdb_resource_flags {
@@ -763,10 +798,13 @@ enum bnxt_ulp_resource_sub_type {
 	BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_ENCAP_REC_CACHE = 16,
 	BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_SRV6_ENCAP_REC_CACHE = 17,
 	BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_RSS_PARAMS = 18,
+	BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_MULTI_SHARED_MIRROR = 19,
 	BNXT_ULP_RESOURCE_SUB_TYPE_VNIC_TABLE_RSS = 0,
 	BNXT_ULP_RESOURCE_SUB_TYPE_VNIC_TABLE_QUEUE = 1,
 	BNXT_ULP_RESOURCE_SUB_TYPE_GLOBAL_REGISTER_CUST_VXLAN = 0,
-	BNXT_ULP_RESOURCE_SUB_TYPE_GLOBAL_REGISTER_CUST_ECPRI = 1
+	BNXT_ULP_RESOURCE_SUB_TYPE_GLOBAL_REGISTER_CUST_ECPRI = 1,
+	BNXT_ULP_RESOURCE_SUB_TYPE_GLOBAL_REGISTER_CUST_VXLAN_GPE = 2,
+	BNXT_ULP_RESOURCE_SUB_TYPE_GLOBAL_REGISTER_CUST_VXLAN_GPE_V6 = 3
 };
 
 enum bnxt_ulp_session_type {
@@ -1006,6 +1044,7 @@ enum ulp_wp_sym {
 	ULP_WP_SYM_TUN_HDR_ERROR_YES = 1,
 	ULP_WP_SYM_TUN_HDR_TYPE_IGNORE = 0,
 	ULP_WP_SYM_TUN_HDR_TYPE_VXLAN = 0,
+	ULP_WP_SYM_TUN_HDR_TYPE_VXLAN_GPE = 0,
 	ULP_WP_SYM_TUN_HDR_TYPE_GENEVE = 1,
 	ULP_WP_SYM_TUN_HDR_TYPE_NVGRE = 2,
 	ULP_WP_SYM_TUN_HDR_TYPE_GRE = 3,
@@ -1015,7 +1054,11 @@ enum ulp_wp_sym {
 	ULP_WP_SYM_TUN_HDR_TYPE_MPLS = 7,
 	ULP_WP_SYM_TUN_HDR_TYPE_UPAR1 = 8,
 	ULP_WP_SYM_TUN_HDR_TYPE_UPAR2 = 9,
+	ULP_WP_SYM_TUN_HDR_TYPE_UPAR3 = 10,
+	ULP_WP_SYM_TUN_HDR_TYPE_UPAR4 = 11,
 	ULP_WP_SYM_TUN_HDR_TYPE_NONE = 15,
+	ULP_WP_SYM_TUN_HDR_TYPE_UPAR_MASK = 14,
+	ULP_WP_SYM_TUN_HDR_TYPE_TID_MASK = 0,
 	ULP_WP_SYM_TUN_HDR_FLAGS_IGNORE = 0,
 	ULP_WP_SYM_L2_HDR_VALID_IGNORE = 0,
 	ULP_WP_SYM_L2_HDR_VALID_NO = 0,
@@ -1159,7 +1202,7 @@ enum ulp_wp_sym {
 	ULP_WP_SYM_NO = 0,
 	ULP_WP_SYM_YES = 1,
 	ULP_WP_SYM_RECYCLE_DST = 0x800,
-	ULP_WP_SYM_VF_2_VFR_META_VAL = 0,
+	ULP_WP_SYM_VF_2_VFR_META_VAL = 8192,
 	ULP_WP_SYM_VF_2_VF_META_VAL = 0,
 	ULP_WP_SYM_VF_2_VFR_META_MASK = 0,
 	ULP_WP_SYM_META_PROFILE_0 = 0,
@@ -1253,6 +1296,7 @@ enum ulp_thor_sym {
 	ULP_THOR_SYM_TUN_HDR_ERROR_YES = 1,
 	ULP_THOR_SYM_TUN_HDR_TYPE_IGNORE = 0,
 	ULP_THOR_SYM_TUN_HDR_TYPE_VXLAN = 0,
+	ULP_THOR_SYM_TUN_HDR_TYPE_VXLAN_GPE = 0,
 	ULP_THOR_SYM_TUN_HDR_TYPE_GENEVE = 1,
 	ULP_THOR_SYM_TUN_HDR_TYPE_NVGRE = 2,
 	ULP_THOR_SYM_TUN_HDR_TYPE_GRE = 3,
@@ -1262,7 +1306,11 @@ enum ulp_thor_sym {
 	ULP_THOR_SYM_TUN_HDR_TYPE_MPLS = 7,
 	ULP_THOR_SYM_TUN_HDR_TYPE_UPAR1 = 8,
 	ULP_THOR_SYM_TUN_HDR_TYPE_UPAR2 = 9,
+	ULP_THOR_SYM_TUN_HDR_TYPE_UPAR3 = 10,
+	ULP_THOR_SYM_TUN_HDR_TYPE_UPAR4 = 11,
 	ULP_THOR_SYM_TUN_HDR_TYPE_NONE = 15,
+	ULP_THOR_SYM_TUN_HDR_TYPE_UPAR_MASK = 14,
+	ULP_THOR_SYM_TUN_HDR_TYPE_TID_MASK = 3840,
 	ULP_THOR_SYM_TUN_HDR_FLAGS_IGNORE = 0,
 	ULP_THOR_SYM_L2_HDR_VALID_IGNORE = 0,
 	ULP_THOR_SYM_L2_HDR_VALID_NO = 0,
@@ -3327,550 +3375,728 @@ enum bnxt_ulp_class_hid {
 
 enum bnxt_ulp_act_hid {
 	BNXT_ULP_ACT_HID_0000 = 0x0000,
-	BNXT_ULP_ACT_HID_0008 = 0x0008,
-	BNXT_ULP_ACT_HID_2000 = 0x2000,
-	BNXT_ULP_ACT_HID_1988 = 0x1988,
-	BNXT_ULP_ACT_HID_0080 = 0x0080,
-	BNXT_ULP_ACT_HID_3988 = 0x3988,
-	BNXT_ULP_ACT_HID_1a08 = 0x1a08,
-	BNXT_ULP_ACT_HID_0010 = 0x0010,
 	BNXT_ULP_ACT_HID_0040 = 0x0040,
-	BNXT_ULP_ACT_HID_0050 = 0x0050,
-	BNXT_ULP_ACT_HID_0018 = 0x0018,
-	BNXT_ULP_ACT_HID_2010 = 0x2010,
-	BNXT_ULP_ACT_HID_1998 = 0x1998,
-	BNXT_ULP_ACT_HID_0090 = 0x0090,
-	BNXT_ULP_ACT_HID_3998 = 0x3998,
-	BNXT_ULP_ACT_HID_1a18 = 0x1a18,
-	BNXT_ULP_ACT_HID_32ea = 0x32ea,
-	BNXT_ULP_ACT_HID_32f2 = 0x32f2,
-	BNXT_ULP_ACT_HID_52ea = 0x52ea,
-	BNXT_ULP_ACT_HID_4c72 = 0x4c72,
-	BNXT_ULP_ACT_HID_336a = 0x336a,
-	BNXT_ULP_ACT_HID_6c72 = 0x6c72,
-	BNXT_ULP_ACT_HID_4cf2 = 0x4cf2,
-	BNXT_ULP_ACT_HID_32fa = 0x32fa,
-	BNXT_ULP_ACT_HID_3302 = 0x3302,
-	BNXT_ULP_ACT_HID_52fa = 0x52fa,
-	BNXT_ULP_ACT_HID_4c82 = 0x4c82,
-	BNXT_ULP_ACT_HID_337a = 0x337a,
-	BNXT_ULP_ACT_HID_6c82 = 0x6c82,
-	BNXT_ULP_ACT_HID_4d02 = 0x4d02,
-	BNXT_ULP_ACT_HID_0808 = 0x0808,
-	BNXT_ULP_ACT_HID_1008 = 0x1008,
-	BNXT_ULP_ACT_HID_1808 = 0x1808,
-	BNXT_ULP_ACT_HID_0818 = 0x0818,
-	BNXT_ULP_ACT_HID_1018 = 0x1018,
-	BNXT_ULP_ACT_HID_1818 = 0x1818,
-	BNXT_ULP_ACT_HID_0880 = 0x0880,
-	BNXT_ULP_ACT_HID_1080 = 0x1080,
-	BNXT_ULP_ACT_HID_1880 = 0x1880,
-	BNXT_ULP_ACT_HID_0890 = 0x0890,
-	BNXT_ULP_ACT_HID_1090 = 0x1090,
-	BNXT_ULP_ACT_HID_1890 = 0x1890,
-	BNXT_ULP_ACT_HID_3af2 = 0x3af2,
-	BNXT_ULP_ACT_HID_42f2 = 0x42f2,
-	BNXT_ULP_ACT_HID_4af2 = 0x4af2,
-	BNXT_ULP_ACT_HID_3b02 = 0x3b02,
-	BNXT_ULP_ACT_HID_4302 = 0x4302,
-	BNXT_ULP_ACT_HID_4b02 = 0x4b02,
-	BNXT_ULP_ACT_HID_3b6a = 0x3b6a,
-	BNXT_ULP_ACT_HID_436a = 0x436a,
-	BNXT_ULP_ACT_HID_4b6a = 0x4b6a,
-	BNXT_ULP_ACT_HID_3b7a = 0x3b7a,
-	BNXT_ULP_ACT_HID_437a = 0x437a,
-	BNXT_ULP_ACT_HID_4b7a = 0x4b7a,
-	BNXT_ULP_ACT_HID_640d = 0x640d,
-	BNXT_ULP_ACT_HID_641d = 0x641d,
-	BNXT_ULP_ACT_HID_071a = 0x071a,
-	BNXT_ULP_ACT_HID_0800 = 0x0800,
-	BNXT_ULP_ACT_HID_1000 = 0x1000,
-	BNXT_ULP_ACT_HID_1800 = 0x1800,
-	BNXT_ULP_ACT_HID_0810 = 0x0810,
-	BNXT_ULP_ACT_HID_1010 = 0x1010,
-	BNXT_ULP_ACT_HID_1810 = 0x1810,
-	BNXT_ULP_ACT_HID_1110 = 0x1110,
-	BNXT_ULP_ACT_HID_4420 = 0x4420,
-	BNXT_ULP_ACT_HID_2220 = 0x2220,
-	BNXT_ULP_ACT_HID_0c84 = 0x0c84,
-	BNXT_ULP_ACT_HID_3f94 = 0x3f94,
-	BNXT_ULP_ACT_HID_3330 = 0x3330,
-	BNXT_ULP_ACT_HID_50a4 = 0x50a4,
-	BNXT_ULP_ACT_HID_1910 = 0x1910,
-	BNXT_ULP_ACT_HID_4c20 = 0x4c20,
-	BNXT_ULP_ACT_HID_2a20 = 0x2a20,
-	BNXT_ULP_ACT_HID_1484 = 0x1484,
-	BNXT_ULP_ACT_HID_4794 = 0x4794,
-	BNXT_ULP_ACT_HID_3b30 = 0x3b30,
-	BNXT_ULP_ACT_HID_58a4 = 0x58a4,
-	BNXT_ULP_ACT_HID_2110 = 0x2110,
-	BNXT_ULP_ACT_HID_5420 = 0x5420,
-	BNXT_ULP_ACT_HID_3220 = 0x3220,
-	BNXT_ULP_ACT_HID_1c84 = 0x1c84,
-	BNXT_ULP_ACT_HID_4f94 = 0x4f94,
-	BNXT_ULP_ACT_HID_4330 = 0x4330,
-	BNXT_ULP_ACT_HID_60a4 = 0x60a4,
-	BNXT_ULP_ACT_HID_2910 = 0x2910,
-	BNXT_ULP_ACT_HID_5c20 = 0x5c20,
-	BNXT_ULP_ACT_HID_3a20 = 0x3a20,
-	BNXT_ULP_ACT_HID_2484 = 0x2484,
-	BNXT_ULP_ACT_HID_5794 = 0x5794,
-	BNXT_ULP_ACT_HID_4b30 = 0x4b30,
-	BNXT_ULP_ACT_HID_68a4 = 0x68a4,
-	BNXT_ULP_ACT_HID_1120 = 0x1120,
-	BNXT_ULP_ACT_HID_4430 = 0x4430,
-	BNXT_ULP_ACT_HID_2230 = 0x2230,
-	BNXT_ULP_ACT_HID_0c94 = 0x0c94,
-	BNXT_ULP_ACT_HID_3fa4 = 0x3fa4,
-	BNXT_ULP_ACT_HID_3340 = 0x3340,
-	BNXT_ULP_ACT_HID_50b4 = 0x50b4,
-	BNXT_ULP_ACT_HID_1920 = 0x1920,
-	BNXT_ULP_ACT_HID_4c30 = 0x4c30,
-	BNXT_ULP_ACT_HID_2a30 = 0x2a30,
-	BNXT_ULP_ACT_HID_1494 = 0x1494,
-	BNXT_ULP_ACT_HID_47a4 = 0x47a4,
+	BNXT_ULP_ACT_HID_10000 = 0x10000,
+	BNXT_ULP_ACT_HID_cc40 = 0xcc40,
+	BNXT_ULP_ACT_HID_0400 = 0x0400,
+	BNXT_ULP_ACT_HID_1cc40 = 0x1cc40,
+	BNXT_ULP_ACT_HID_d040 = 0xd040,
+	BNXT_ULP_ACT_HID_0080 = 0x0080,
+	BNXT_ULP_ACT_HID_0200 = 0x0200,
+	BNXT_ULP_ACT_HID_0280 = 0x0280,
+	BNXT_ULP_ACT_HID_00c0 = 0x00c0,
+	BNXT_ULP_ACT_HID_10080 = 0x10080,
+	BNXT_ULP_ACT_HID_ccc0 = 0xccc0,
+	BNXT_ULP_ACT_HID_0480 = 0x0480,
+	BNXT_ULP_ACT_HID_1ccc0 = 0x1ccc0,
+	BNXT_ULP_ACT_HID_d0c0 = 0xd0c0,
+	BNXT_ULP_ACT_HID_19742 = 0x19742,
+	BNXT_ULP_ACT_HID_19782 = 0x19782,
+	BNXT_ULP_ACT_HID_29742 = 0x29742,
+	BNXT_ULP_ACT_HID_26382 = 0x26382,
+	BNXT_ULP_ACT_HID_19b42 = 0x19b42,
+	BNXT_ULP_ACT_HID_36382 = 0x36382,
+	BNXT_ULP_ACT_HID_26782 = 0x26782,
+	BNXT_ULP_ACT_HID_197c2 = 0x197c2,
+	BNXT_ULP_ACT_HID_19802 = 0x19802,
+	BNXT_ULP_ACT_HID_297c2 = 0x297c2,
+	BNXT_ULP_ACT_HID_26402 = 0x26402,
+	BNXT_ULP_ACT_HID_19bc2 = 0x19bc2,
+	BNXT_ULP_ACT_HID_36402 = 0x36402,
+	BNXT_ULP_ACT_HID_26802 = 0x26802,
+	BNXT_ULP_ACT_HID_bca0 = 0xbca0,
+	BNXT_ULP_ACT_HID_bce0 = 0xbce0,
+	BNXT_ULP_ACT_HID_1bca0 = 0x1bca0,
+	BNXT_ULP_ACT_HID_168e0 = 0x168e0,
+	BNXT_ULP_ACT_HID_a0a0 = 0xa0a0,
+	BNXT_ULP_ACT_HID_268e0 = 0x268e0,
+	BNXT_ULP_ACT_HID_16ce0 = 0x16ce0,
+	BNXT_ULP_ACT_HID_bd20 = 0xbd20,
+	BNXT_ULP_ACT_HID_bd60 = 0xbd60,
+	BNXT_ULP_ACT_HID_1bd20 = 0x1bd20,
+	BNXT_ULP_ACT_HID_16960 = 0x16960,
+	BNXT_ULP_ACT_HID_a120 = 0xa120,
+	BNXT_ULP_ACT_HID_26960 = 0x26960,
+	BNXT_ULP_ACT_HID_16d60 = 0x16d60,
+	BNXT_ULP_ACT_HID_4040 = 0x4040,
+	BNXT_ULP_ACT_HID_8040 = 0x8040,
+	BNXT_ULP_ACT_HID_c040 = 0xc040,
+	BNXT_ULP_ACT_HID_40c0 = 0x40c0,
+	BNXT_ULP_ACT_HID_80c0 = 0x80c0,
+	BNXT_ULP_ACT_HID_c0c0 = 0xc0c0,
+	BNXT_ULP_ACT_HID_4400 = 0x4400,
+	BNXT_ULP_ACT_HID_8400 = 0x8400,
+	BNXT_ULP_ACT_HID_c400 = 0xc400,
+	BNXT_ULP_ACT_HID_4480 = 0x4480,
+	BNXT_ULP_ACT_HID_8480 = 0x8480,
+	BNXT_ULP_ACT_HID_c480 = 0xc480,
+	BNXT_ULP_ACT_HID_1d782 = 0x1d782,
+	BNXT_ULP_ACT_HID_21782 = 0x21782,
+	BNXT_ULP_ACT_HID_25782 = 0x25782,
+	BNXT_ULP_ACT_HID_1d802 = 0x1d802,
+	BNXT_ULP_ACT_HID_21802 = 0x21802,
+	BNXT_ULP_ACT_HID_25802 = 0x25802,
+	BNXT_ULP_ACT_HID_1db42 = 0x1db42,
+	BNXT_ULP_ACT_HID_21b42 = 0x21b42,
+	BNXT_ULP_ACT_HID_25b42 = 0x25b42,
+	BNXT_ULP_ACT_HID_1dbc2 = 0x1dbc2,
+	BNXT_ULP_ACT_HID_21bc2 = 0x21bc2,
+	BNXT_ULP_ACT_HID_25bc2 = 0x25bc2,
+	BNXT_ULP_ACT_HID_fce0 = 0xfce0,
+	BNXT_ULP_ACT_HID_13ce0 = 0x13ce0,
+	BNXT_ULP_ACT_HID_17ce0 = 0x17ce0,
+	BNXT_ULP_ACT_HID_fd60 = 0xfd60,
+	BNXT_ULP_ACT_HID_13d60 = 0x13d60,
+	BNXT_ULP_ACT_HID_17d60 = 0x17d60,
+	BNXT_ULP_ACT_HID_e0a0 = 0xe0a0,
+	BNXT_ULP_ACT_HID_120a0 = 0x120a0,
+	BNXT_ULP_ACT_HID_160a0 = 0x160a0,
+	BNXT_ULP_ACT_HID_e120 = 0xe120,
+	BNXT_ULP_ACT_HID_12120 = 0x12120,
+	BNXT_ULP_ACT_HID_16120 = 0x16120,
+	BNXT_ULP_ACT_HID_32061 = 0x32061,
+	BNXT_ULP_ACT_HID_320e1 = 0x320e1,
+	BNXT_ULP_ACT_HID_388a = 0x388a,
+	BNXT_ULP_ACT_HID_4000 = 0x4000,
+	BNXT_ULP_ACT_HID_8000 = 0x8000,
+	BNXT_ULP_ACT_HID_c000 = 0xc000,
+	BNXT_ULP_ACT_HID_4080 = 0x4080,
+	BNXT_ULP_ACT_HID_8080 = 0x8080,
+	BNXT_ULP_ACT_HID_c080 = 0xc080,
+	BNXT_ULP_ACT_HID_8880 = 0x8880,
+	BNXT_ULP_ACT_HID_22100 = 0x22100,
+	BNXT_ULP_ACT_HID_11100 = 0x11100,
+	BNXT_ULP_ACT_HID_6420 = 0x6420,
+	BNXT_ULP_ACT_HID_1fca0 = 0x1fca0,
+	BNXT_ULP_ACT_HID_19980 = 0x19980,
+	BNXT_ULP_ACT_HID_28520 = 0x28520,
+	BNXT_ULP_ACT_HID_c880 = 0xc880,
+	BNXT_ULP_ACT_HID_26100 = 0x26100,
+	BNXT_ULP_ACT_HID_15100 = 0x15100,
+	BNXT_ULP_ACT_HID_a420 = 0xa420,
+	BNXT_ULP_ACT_HID_23ca0 = 0x23ca0,
+	BNXT_ULP_ACT_HID_1d980 = 0x1d980,
+	BNXT_ULP_ACT_HID_2c520 = 0x2c520,
+	BNXT_ULP_ACT_HID_10880 = 0x10880,
+	BNXT_ULP_ACT_HID_2a100 = 0x2a100,
+	BNXT_ULP_ACT_HID_19100 = 0x19100,
+	BNXT_ULP_ACT_HID_e420 = 0xe420,
+	BNXT_ULP_ACT_HID_27ca0 = 0x27ca0,
+	BNXT_ULP_ACT_HID_21980 = 0x21980,
+	BNXT_ULP_ACT_HID_30520 = 0x30520,
+	BNXT_ULP_ACT_HID_14880 = 0x14880,
+	BNXT_ULP_ACT_HID_2e100 = 0x2e100,
+	BNXT_ULP_ACT_HID_1d100 = 0x1d100,
+	BNXT_ULP_ACT_HID_12420 = 0x12420,
+	BNXT_ULP_ACT_HID_2bca0 = 0x2bca0,
+	BNXT_ULP_ACT_HID_25980 = 0x25980,
+	BNXT_ULP_ACT_HID_34520 = 0x34520,
+	BNXT_ULP_ACT_HID_8900 = 0x8900,
+	BNXT_ULP_ACT_HID_22180 = 0x22180,
+	BNXT_ULP_ACT_HID_11180 = 0x11180,
+	BNXT_ULP_ACT_HID_64a0 = 0x64a0,
+	BNXT_ULP_ACT_HID_1fd20 = 0x1fd20,
+	BNXT_ULP_ACT_HID_19a00 = 0x19a00,
+	BNXT_ULP_ACT_HID_285a0 = 0x285a0,
+	BNXT_ULP_ACT_HID_c900 = 0xc900,
+	BNXT_ULP_ACT_HID_26180 = 0x26180,
+	BNXT_ULP_ACT_HID_15180 = 0x15180,
+	BNXT_ULP_ACT_HID_a4a0 = 0xa4a0,
+	BNXT_ULP_ACT_HID_23d20 = 0x23d20,
+	BNXT_ULP_ACT_HID_1da00 = 0x1da00,
+	BNXT_ULP_ACT_HID_2c5a0 = 0x2c5a0,
+	BNXT_ULP_ACT_HID_10900 = 0x10900,
+	BNXT_ULP_ACT_HID_2a180 = 0x2a180,
+	BNXT_ULP_ACT_HID_19180 = 0x19180,
+	BNXT_ULP_ACT_HID_e4a0 = 0xe4a0,
+	BNXT_ULP_ACT_HID_27d20 = 0x27d20,
+	BNXT_ULP_ACT_HID_21a00 = 0x21a00,
+	BNXT_ULP_ACT_HID_305a0 = 0x305a0,
+	BNXT_ULP_ACT_HID_14900 = 0x14900,
+	BNXT_ULP_ACT_HID_2e180 = 0x2e180,
+	BNXT_ULP_ACT_HID_1d180 = 0x1d180,
+	BNXT_ULP_ACT_HID_124a0 = 0x124a0,
+	BNXT_ULP_ACT_HID_2bd20 = 0x2bd20,
+	BNXT_ULP_ACT_HID_25a00 = 0x25a00,
+	BNXT_ULP_ACT_HID_345a0 = 0x345a0,
+	BNXT_ULP_ACT_HID_154c0 = 0x154c0,
+	BNXT_ULP_ACT_HID_2ed40 = 0x2ed40,
+	BNXT_ULP_ACT_HID_1dd40 = 0x1dd40,
+	BNXT_ULP_ACT_HID_13060 = 0x13060,
+	BNXT_ULP_ACT_HID_2c8e0 = 0x2c8e0,
+	BNXT_ULP_ACT_HID_35160 = 0x35160,
+	BNXT_ULP_ACT_HID_15540 = 0x15540,
+	BNXT_ULP_ACT_HID_2edc0 = 0x2edc0,
+	BNXT_ULP_ACT_HID_1ddc0 = 0x1ddc0,
+	BNXT_ULP_ACT_HID_130e0 = 0x130e0,
+	BNXT_ULP_ACT_HID_2c960 = 0x2c960,
+	BNXT_ULP_ACT_HID_351e0 = 0x351e0,
+	BNXT_ULP_ACT_HID_194c0 = 0x194c0,
+	BNXT_ULP_ACT_HID_32d40 = 0x32d40,
+	BNXT_ULP_ACT_HID_21d40 = 0x21d40,
+	BNXT_ULP_ACT_HID_17060 = 0x17060,
+	BNXT_ULP_ACT_HID_308e0 = 0x308e0,
+	BNXT_ULP_ACT_HID_39160 = 0x39160,
+	BNXT_ULP_ACT_HID_19540 = 0x19540,
+	BNXT_ULP_ACT_HID_32dc0 = 0x32dc0,
+	BNXT_ULP_ACT_HID_21dc0 = 0x21dc0,
+	BNXT_ULP_ACT_HID_170e0 = 0x170e0,
+	BNXT_ULP_ACT_HID_30960 = 0x30960,
+	BNXT_ULP_ACT_HID_391e0 = 0x391e0,
+	BNXT_ULP_ACT_HID_1d4c0 = 0x1d4c0,
+	BNXT_ULP_ACT_HID_36d40 = 0x36d40,
+	BNXT_ULP_ACT_HID_25d40 = 0x25d40,
+	BNXT_ULP_ACT_HID_1b060 = 0x1b060,
+	BNXT_ULP_ACT_HID_348e0 = 0x348e0,
+	BNXT_ULP_ACT_HID_3d160 = 0x3d160,
+	BNXT_ULP_ACT_HID_1d540 = 0x1d540,
+	BNXT_ULP_ACT_HID_36dc0 = 0x36dc0,
+	BNXT_ULP_ACT_HID_25dc0 = 0x25dc0,
+	BNXT_ULP_ACT_HID_1b0e0 = 0x1b0e0,
+	BNXT_ULP_ACT_HID_34960 = 0x34960,
+	BNXT_ULP_ACT_HID_3d1e0 = 0x3d1e0,
+	BNXT_ULP_ACT_HID_214c0 = 0x214c0,
+	BNXT_ULP_ACT_HID_3ad40 = 0x3ad40,
+	BNXT_ULP_ACT_HID_29d40 = 0x29d40,
+	BNXT_ULP_ACT_HID_1f060 = 0x1f060,
+	BNXT_ULP_ACT_HID_388e0 = 0x388e0,
+	BNXT_ULP_ACT_HID_3380 = 0x3380,
+	BNXT_ULP_ACT_HID_21540 = 0x21540,
+	BNXT_ULP_ACT_HID_3adc0 = 0x3adc0,
+	BNXT_ULP_ACT_HID_29dc0 = 0x29dc0,
+	BNXT_ULP_ACT_HID_1f0e0 = 0x1f0e0,
+	BNXT_ULP_ACT_HID_38960 = 0x38960,
+	BNXT_ULP_ACT_HID_3400 = 0x3400,
+	BNXT_ULP_ACT_HID_1d742 = 0x1d742,
+	BNXT_ULP_ACT_HID_21742 = 0x21742,
+	BNXT_ULP_ACT_HID_25742 = 0x25742,
+	BNXT_ULP_ACT_HID_1d7c2 = 0x1d7c2,
+	BNXT_ULP_ACT_HID_217c2 = 0x217c2,
+	BNXT_ULP_ACT_HID_257c2 = 0x257c2,
+	BNXT_ULP_ACT_HID_21fc2 = 0x21fc2,
+	BNXT_ULP_ACT_HID_3b842 = 0x3b842,
+	BNXT_ULP_ACT_HID_2a842 = 0x2a842,
+	BNXT_ULP_ACT_HID_1fb62 = 0x1fb62,
+	BNXT_ULP_ACT_HID_393e2 = 0x393e2,
+	BNXT_ULP_ACT_HID_330c2 = 0x330c2,
+	BNXT_ULP_ACT_HID_3e82 = 0x3e82,
+	BNXT_ULP_ACT_HID_25fc2 = 0x25fc2,
+	BNXT_ULP_ACT_HID_1a62 = 0x1a62,
+	BNXT_ULP_ACT_HID_2e842 = 0x2e842,
+	BNXT_ULP_ACT_HID_23b62 = 0x23b62,
+	BNXT_ULP_ACT_HID_3d3e2 = 0x3d3e2,
+	BNXT_ULP_ACT_HID_370c2 = 0x370c2,
+	BNXT_ULP_ACT_HID_7e82 = 0x7e82,
+	BNXT_ULP_ACT_HID_29fc2 = 0x29fc2,
+	BNXT_ULP_ACT_HID_5a62 = 0x5a62,
+	BNXT_ULP_ACT_HID_32842 = 0x32842,
+	BNXT_ULP_ACT_HID_27b62 = 0x27b62,
+	BNXT_ULP_ACT_HID_3602 = 0x3602,
+	BNXT_ULP_ACT_HID_3b0c2 = 0x3b0c2,
+	BNXT_ULP_ACT_HID_be82 = 0xbe82,
+	BNXT_ULP_ACT_HID_2dfc2 = 0x2dfc2,
+	BNXT_ULP_ACT_HID_9a62 = 0x9a62,
+	BNXT_ULP_ACT_HID_36842 = 0x36842,
+	BNXT_ULP_ACT_HID_2bb62 = 0x2bb62,
+	BNXT_ULP_ACT_HID_7602 = 0x7602,
+	BNXT_ULP_ACT_HID_12e2 = 0x12e2,
+	BNXT_ULP_ACT_HID_fe82 = 0xfe82,
+	BNXT_ULP_ACT_HID_22042 = 0x22042,
+	BNXT_ULP_ACT_HID_3b8c2 = 0x3b8c2,
+	BNXT_ULP_ACT_HID_2a8c2 = 0x2a8c2,
+	BNXT_ULP_ACT_HID_1fbe2 = 0x1fbe2,
+	BNXT_ULP_ACT_HID_39462 = 0x39462,
+	BNXT_ULP_ACT_HID_33142 = 0x33142,
+	BNXT_ULP_ACT_HID_3f02 = 0x3f02,
+	BNXT_ULP_ACT_HID_26042 = 0x26042,
+	BNXT_ULP_ACT_HID_1ae2 = 0x1ae2,
+	BNXT_ULP_ACT_HID_2e8c2 = 0x2e8c2,
+	BNXT_ULP_ACT_HID_23be2 = 0x23be2,
+	BNXT_ULP_ACT_HID_3d462 = 0x3d462,
+	BNXT_ULP_ACT_HID_37142 = 0x37142,
+	BNXT_ULP_ACT_HID_7f02 = 0x7f02,
+	BNXT_ULP_ACT_HID_2a042 = 0x2a042,
+	BNXT_ULP_ACT_HID_5ae2 = 0x5ae2,
+	BNXT_ULP_ACT_HID_328c2 = 0x328c2,
+	BNXT_ULP_ACT_HID_27be2 = 0x27be2,
+	BNXT_ULP_ACT_HID_3682 = 0x3682,
+	BNXT_ULP_ACT_HID_3b142 = 0x3b142,
+	BNXT_ULP_ACT_HID_bf02 = 0xbf02,
+	BNXT_ULP_ACT_HID_2e042 = 0x2e042,
+	BNXT_ULP_ACT_HID_9ae2 = 0x9ae2,
+	BNXT_ULP_ACT_HID_368c2 = 0x368c2,
+	BNXT_ULP_ACT_HID_2bbe2 = 0x2bbe2,
+	BNXT_ULP_ACT_HID_7682 = 0x7682,
+	BNXT_ULP_ACT_HID_1362 = 0x1362,
+	BNXT_ULP_ACT_HID_ff02 = 0xff02,
+	BNXT_ULP_ACT_HID_2ec02 = 0x2ec02,
+	BNXT_ULP_ACT_HID_a6a2 = 0xa6a2,
+	BNXT_ULP_ACT_HID_37482 = 0x37482,
+	BNXT_ULP_ACT_HID_2c7a2 = 0x2c7a2,
+	BNXT_ULP_ACT_HID_8242 = 0x8242,
+	BNXT_ULP_ACT_HID_10ac2 = 0x10ac2,
+	BNXT_ULP_ACT_HID_2ec82 = 0x2ec82,
+	BNXT_ULP_ACT_HID_a722 = 0xa722,
+	BNXT_ULP_ACT_HID_37502 = 0x37502,
+	BNXT_ULP_ACT_HID_2c822 = 0x2c822,
+	BNXT_ULP_ACT_HID_82c2 = 0x82c2,
+	BNXT_ULP_ACT_HID_10b42 = 0x10b42,
+	BNXT_ULP_ACT_HID_32c02 = 0x32c02,
+	BNXT_ULP_ACT_HID_e6a2 = 0xe6a2,
+	BNXT_ULP_ACT_HID_3b482 = 0x3b482,
+	BNXT_ULP_ACT_HID_307a2 = 0x307a2,
+	BNXT_ULP_ACT_HID_c242 = 0xc242,
+	BNXT_ULP_ACT_HID_14ac2 = 0x14ac2,
+	BNXT_ULP_ACT_HID_32c82 = 0x32c82,
+	BNXT_ULP_ACT_HID_e722 = 0xe722,
+	BNXT_ULP_ACT_HID_3b502 = 0x3b502,
+	BNXT_ULP_ACT_HID_30822 = 0x30822,
+	BNXT_ULP_ACT_HID_c2c2 = 0xc2c2,
+	BNXT_ULP_ACT_HID_14b42 = 0x14b42,
+	BNXT_ULP_ACT_HID_36c02 = 0x36c02,
+	BNXT_ULP_ACT_HID_126a2 = 0x126a2,
+	BNXT_ULP_ACT_HID_16a2 = 0x16a2,
+	BNXT_ULP_ACT_HID_347a2 = 0x347a2,
+	BNXT_ULP_ACT_HID_10242 = 0x10242,
+	BNXT_ULP_ACT_HID_18ac2 = 0x18ac2,
+	BNXT_ULP_ACT_HID_36c82 = 0x36c82,
+	BNXT_ULP_ACT_HID_12722 = 0x12722,
+	BNXT_ULP_ACT_HID_1722 = 0x1722,
+	BNXT_ULP_ACT_HID_34822 = 0x34822,
+	BNXT_ULP_ACT_HID_102c2 = 0x102c2,
+	BNXT_ULP_ACT_HID_18b42 = 0x18b42,
+	BNXT_ULP_ACT_HID_3ac02 = 0x3ac02,
+	BNXT_ULP_ACT_HID_166a2 = 0x166a2,
+	BNXT_ULP_ACT_HID_56a2 = 0x56a2,
+	BNXT_ULP_ACT_HID_387a2 = 0x387a2,
+	BNXT_ULP_ACT_HID_14242 = 0x14242,
+	BNXT_ULP_ACT_HID_1cac2 = 0x1cac2,
+	BNXT_ULP_ACT_HID_3ac82 = 0x3ac82,
+	BNXT_ULP_ACT_HID_16722 = 0x16722,
+	BNXT_ULP_ACT_HID_5722 = 0x5722,
+	BNXT_ULP_ACT_HID_38822 = 0x38822,
+	BNXT_ULP_ACT_HID_142c2 = 0x142c2,
+	BNXT_ULP_ACT_HID_1cb42 = 0x1cb42,
+	BNXT_ULP_ACT_HID_12520 = 0x12520,
+	BNXT_ULP_ACT_HID_2bda0 = 0x2bda0,
+	BNXT_ULP_ACT_HID_1ada0 = 0x1ada0,
+	BNXT_ULP_ACT_HID_120c0 = 0x120c0,
+	BNXT_ULP_ACT_HID_2b940 = 0x2b940,
+	BNXT_ULP_ACT_HID_23620 = 0x23620,
+	BNXT_ULP_ACT_HID_321c0 = 0x321c0,
+	BNXT_ULP_ACT_HID_125a0 = 0x125a0,
+	BNXT_ULP_ACT_HID_2be20 = 0x2be20,
+	BNXT_ULP_ACT_HID_1ae20 = 0x1ae20,
+	BNXT_ULP_ACT_HID_12140 = 0x12140,
+	BNXT_ULP_ACT_HID_2b9c0 = 0x2b9c0,
+	BNXT_ULP_ACT_HID_236a0 = 0x236a0,
+	BNXT_ULP_ACT_HID_32240 = 0x32240,
+	BNXT_ULP_ACT_HID_1f160 = 0x1f160,
+	BNXT_ULP_ACT_HID_3a9e0 = 0x3a9e0,
+	BNXT_ULP_ACT_HID_279e0 = 0x279e0,
+	BNXT_ULP_ACT_HID_1ed00 = 0x1ed00,
+	BNXT_ULP_ACT_HID_36580 = 0x36580,
+	BNXT_ULP_ACT_HID_3020 = 0x3020,
+	BNXT_ULP_ACT_HID_1f1e0 = 0x1f1e0,
+	BNXT_ULP_ACT_HID_3aa60 = 0x3aa60,
+	BNXT_ULP_ACT_HID_27a60 = 0x27a60,
+	BNXT_ULP_ACT_HID_1ed80 = 0x1ed80,
+	BNXT_ULP_ACT_HID_36600 = 0x36600,
+	BNXT_ULP_ACT_HID_30a0 = 0x30a0,
+	BNXT_ULP_ACT_HID_0100 = 0x0100,
+	BNXT_ULP_ACT_HID_0180 = 0x0180,
+	BNXT_ULP_ACT_HID_32e84 = 0x32e84,
+	BNXT_ULP_ACT_HID_32f04 = 0x32f04,
+	BNXT_ULP_ACT_HID_19842 = 0x19842,
+	BNXT_ULP_ACT_HID_198c2 = 0x198c2,
+	BNXT_ULP_ACT_HID_e7e6 = 0xe7e6,
+	BNXT_ULP_ACT_HID_e866 = 0xe866,
+	BNXT_ULP_ACT_HID_a3e0 = 0xa3e0,
+	BNXT_ULP_ACT_HID_240e0 = 0x240e0,
+	BNXT_ULP_ACT_HID_322c8 = 0x322c8,
+	BNXT_ULP_ACT_HID_e228 = 0xe228,
+	BNXT_ULP_ACT_HID_36130 = 0x36130,
+	BNXT_ULP_ACT_HID_2e840 = 0x2e840,
+	BNXT_ULP_ACT_HID_2e880 = 0x2e880,
+	BNXT_ULP_ACT_HID_2e900 = 0x2e900,
+	BNXT_ULP_ACT_HID_170c0 = 0x170c0,
+	BNXT_ULP_ACT_HID_14ea0 = 0x14ea0,
+	BNXT_ULP_ACT_HID_3b480 = 0x3b480,
+	BNXT_ULP_ACT_HID_23d00 = 0x23d00,
+	BNXT_ULP_ACT_HID_21ae0 = 0x21ae0,
+	BNXT_ULP_ACT_HID_2e8c0 = 0x2e8c0,
+	BNXT_ULP_ACT_HID_17140 = 0x17140,
+	BNXT_ULP_ACT_HID_14f20 = 0x14f20,
+	BNXT_ULP_ACT_HID_3b500 = 0x3b500,
+	BNXT_ULP_ACT_HID_23d80 = 0x23d80,
+	BNXT_ULP_ACT_HID_21b60 = 0x21b60,
+	BNXT_ULP_ACT_HID_a1a2 = 0xa1a2,
+	BNXT_ULP_ACT_HID_a1e2 = 0xa1e2,
+	BNXT_ULP_ACT_HID_a262 = 0xa262,
+	BNXT_ULP_ACT_HID_30802 = 0x30802,
+	BNXT_ULP_ACT_HID_2e5e2 = 0x2e5e2,
+	BNXT_ULP_ACT_HID_16de2 = 0x16de2,
+	BNXT_ULP_ACT_HID_3d442 = 0x3d442,
+	BNXT_ULP_ACT_HID_3b222 = 0x3b222,
+	BNXT_ULP_ACT_HID_a222 = 0xa222,
+	BNXT_ULP_ACT_HID_30882 = 0x30882,
+	BNXT_ULP_ACT_HID_2e662 = 0x2e662,
+	BNXT_ULP_ACT_HID_16e62 = 0x16e62,
+	BNXT_ULP_ACT_HID_3d4c2 = 0x3d4c2,
+	BNXT_ULP_ACT_HID_3b2a2 = 0x3b2a2,
+	BNXT_ULP_ACT_HID_3a4e0 = 0x3a4e0,
+	BNXT_ULP_ACT_HID_3a520 = 0x3a520,
+	BNXT_ULP_ACT_HID_3a5a0 = 0x3a5a0,
+	BNXT_ULP_ACT_HID_22d60 = 0x22d60,
+	BNXT_ULP_ACT_HID_1eb40 = 0x1eb40,
+	BNXT_ULP_ACT_HID_7340 = 0x7340,
+	BNXT_ULP_ACT_HID_2f9a0 = 0x2f9a0,
+	BNXT_ULP_ACT_HID_2b780 = 0x2b780,
+	BNXT_ULP_ACT_HID_3a560 = 0x3a560,
+	BNXT_ULP_ACT_HID_22de0 = 0x22de0,
+	BNXT_ULP_ACT_HID_1ebc0 = 0x1ebc0,
+	BNXT_ULP_ACT_HID_73c0 = 0x73c0,
+	BNXT_ULP_ACT_HID_2fa20 = 0x2fa20,
+	BNXT_ULP_ACT_HID_2b800 = 0x2b800,
+	BNXT_ULP_ACT_HID_32840 = 0x32840,
+	BNXT_ULP_ACT_HID_36840 = 0x36840,
+	BNXT_ULP_ACT_HID_3a840 = 0x3a840,
+	BNXT_ULP_ACT_HID_328c0 = 0x328c0,
+	BNXT_ULP_ACT_HID_368c0 = 0x368c0,
+	BNXT_ULP_ACT_HID_3a8c0 = 0x3a8c0,
+	BNXT_ULP_ACT_HID_370c0 = 0x370c0,
+	BNXT_ULP_ACT_HID_12b60 = 0x12b60,
+	BNXT_ULP_ACT_HID_1b60 = 0x1b60,
+	BNXT_ULP_ACT_HID_34c60 = 0x34c60,
+	BNXT_ULP_ACT_HID_10700 = 0x10700,
+	BNXT_ULP_ACT_HID_18f80 = 0x18f80,
+	BNXT_ULP_ACT_HID_3b0c0 = 0x3b0c0,
+	BNXT_ULP_ACT_HID_16b60 = 0x16b60,
+	BNXT_ULP_ACT_HID_5b60 = 0x5b60,
+	BNXT_ULP_ACT_HID_38c60 = 0x38c60,
+	BNXT_ULP_ACT_HID_14700 = 0x14700,
+	BNXT_ULP_ACT_HID_1cf80 = 0x1cf80,
+	BNXT_ULP_ACT_HID_12e0 = 0x12e0,
+	BNXT_ULP_ACT_HID_1ab60 = 0x1ab60,
+	BNXT_ULP_ACT_HID_9b60 = 0x9b60,
+	BNXT_ULP_ACT_HID_3cc60 = 0x3cc60,
+	BNXT_ULP_ACT_HID_18700 = 0x18700,
+	BNXT_ULP_ACT_HID_20f80 = 0x20f80,
+	BNXT_ULP_ACT_HID_52e0 = 0x52e0,
+	BNXT_ULP_ACT_HID_1eb60 = 0x1eb60,
+	BNXT_ULP_ACT_HID_db60 = 0xdb60,
+	BNXT_ULP_ACT_HID_2e80 = 0x2e80,
+	BNXT_ULP_ACT_HID_1c700 = 0x1c700,
+	BNXT_ULP_ACT_HID_24f80 = 0x24f80,
+	BNXT_ULP_ACT_HID_37140 = 0x37140,
+	BNXT_ULP_ACT_HID_12be0 = 0x12be0,
+	BNXT_ULP_ACT_HID_1be0 = 0x1be0,
+	BNXT_ULP_ACT_HID_34ce0 = 0x34ce0,
+	BNXT_ULP_ACT_HID_10780 = 0x10780,
+	BNXT_ULP_ACT_HID_19000 = 0x19000,
+	BNXT_ULP_ACT_HID_3b140 = 0x3b140,
+	BNXT_ULP_ACT_HID_16be0 = 0x16be0,
+	BNXT_ULP_ACT_HID_5be0 = 0x5be0,
+	BNXT_ULP_ACT_HID_38ce0 = 0x38ce0,
+	BNXT_ULP_ACT_HID_14780 = 0x14780,
+	BNXT_ULP_ACT_HID_1d000 = 0x1d000,
+	BNXT_ULP_ACT_HID_1360 = 0x1360,
+	BNXT_ULP_ACT_HID_1abe0 = 0x1abe0,
+	BNXT_ULP_ACT_HID_9be0 = 0x9be0,
+	BNXT_ULP_ACT_HID_3cce0 = 0x3cce0,
+	BNXT_ULP_ACT_HID_18780 = 0x18780,
+	BNXT_ULP_ACT_HID_21000 = 0x21000,
+	BNXT_ULP_ACT_HID_5360 = 0x5360,
+	BNXT_ULP_ACT_HID_1ebe0 = 0x1ebe0,
+	BNXT_ULP_ACT_HID_dbe0 = 0xdbe0,
+	BNXT_ULP_ACT_HID_2f00 = 0x2f00,
+	BNXT_ULP_ACT_HID_1c780 = 0x1c780,
+	BNXT_ULP_ACT_HID_25000 = 0x25000,
+	BNXT_ULP_ACT_HID_5f20 = 0x5f20,
+	BNXT_ULP_ACT_HID_1f7a0 = 0x1f7a0,
+	BNXT_ULP_ACT_HID_e7a0 = 0xe7a0,
+	BNXT_ULP_ACT_HID_3ac0 = 0x3ac0,
+	BNXT_ULP_ACT_HID_1d340 = 0x1d340,
+	BNXT_ULP_ACT_HID_25bc0 = 0x25bc0,
+	BNXT_ULP_ACT_HID_5fa0 = 0x5fa0,
+	BNXT_ULP_ACT_HID_1f820 = 0x1f820,
+	BNXT_ULP_ACT_HID_e820 = 0xe820,
 	BNXT_ULP_ACT_HID_3b40 = 0x3b40,
-	BNXT_ULP_ACT_HID_58b4 = 0x58b4,
-	BNXT_ULP_ACT_HID_2120 = 0x2120,
-	BNXT_ULP_ACT_HID_5430 = 0x5430,
-	BNXT_ULP_ACT_HID_3230 = 0x3230,
-	BNXT_ULP_ACT_HID_1c94 = 0x1c94,
-	BNXT_ULP_ACT_HID_4fa4 = 0x4fa4,
-	BNXT_ULP_ACT_HID_4340 = 0x4340,
-	BNXT_ULP_ACT_HID_60b4 = 0x60b4,
-	BNXT_ULP_ACT_HID_2920 = 0x2920,
-	BNXT_ULP_ACT_HID_5c30 = 0x5c30,
-	BNXT_ULP_ACT_HID_3a30 = 0x3a30,
-	BNXT_ULP_ACT_HID_2494 = 0x2494,
-	BNXT_ULP_ACT_HID_57a4 = 0x57a4,
-	BNXT_ULP_ACT_HID_4b40 = 0x4b40,
-	BNXT_ULP_ACT_HID_68b4 = 0x68b4,
-	BNXT_ULP_ACT_HID_2a98 = 0x2a98,
-	BNXT_ULP_ACT_HID_5da8 = 0x5da8,
-	BNXT_ULP_ACT_HID_3ba8 = 0x3ba8,
-	BNXT_ULP_ACT_HID_260c = 0x260c,
-	BNXT_ULP_ACT_HID_591c = 0x591c,
-	BNXT_ULP_ACT_HID_6a2c = 0x6a2c,
-	BNXT_ULP_ACT_HID_2aa8 = 0x2aa8,
-	BNXT_ULP_ACT_HID_5db8 = 0x5db8,
-	BNXT_ULP_ACT_HID_3bb8 = 0x3bb8,
-	BNXT_ULP_ACT_HID_261c = 0x261c,
-	BNXT_ULP_ACT_HID_592c = 0x592c,
-	BNXT_ULP_ACT_HID_6a3c = 0x6a3c,
-	BNXT_ULP_ACT_HID_3298 = 0x3298,
-	BNXT_ULP_ACT_HID_65a8 = 0x65a8,
-	BNXT_ULP_ACT_HID_43a8 = 0x43a8,
-	BNXT_ULP_ACT_HID_2e0c = 0x2e0c,
-	BNXT_ULP_ACT_HID_611c = 0x611c,
-	BNXT_ULP_ACT_HID_722c = 0x722c,
-	BNXT_ULP_ACT_HID_32a8 = 0x32a8,
-	BNXT_ULP_ACT_HID_65b8 = 0x65b8,
-	BNXT_ULP_ACT_HID_43b8 = 0x43b8,
-	BNXT_ULP_ACT_HID_2e1c = 0x2e1c,
-	BNXT_ULP_ACT_HID_612c = 0x612c,
-	BNXT_ULP_ACT_HID_723c = 0x723c,
-	BNXT_ULP_ACT_HID_3a98 = 0x3a98,
-	BNXT_ULP_ACT_HID_6da8 = 0x6da8,
-	BNXT_ULP_ACT_HID_4ba8 = 0x4ba8,
-	BNXT_ULP_ACT_HID_360c = 0x360c,
-	BNXT_ULP_ACT_HID_691c = 0x691c,
-	BNXT_ULP_ACT_HID_7a2c = 0x7a2c,
-	BNXT_ULP_ACT_HID_3aa8 = 0x3aa8,
-	BNXT_ULP_ACT_HID_6db8 = 0x6db8,
-	BNXT_ULP_ACT_HID_4bb8 = 0x4bb8,
-	BNXT_ULP_ACT_HID_361c = 0x361c,
-	BNXT_ULP_ACT_HID_692c = 0x692c,
-	BNXT_ULP_ACT_HID_7a3c = 0x7a3c,
-	BNXT_ULP_ACT_HID_4298 = 0x4298,
-	BNXT_ULP_ACT_HID_75a8 = 0x75a8,
-	BNXT_ULP_ACT_HID_53a8 = 0x53a8,
-	BNXT_ULP_ACT_HID_3e0c = 0x3e0c,
-	BNXT_ULP_ACT_HID_711c = 0x711c,
-	BNXT_ULP_ACT_HID_0670 = 0x0670,
-	BNXT_ULP_ACT_HID_42a8 = 0x42a8,
-	BNXT_ULP_ACT_HID_75b8 = 0x75b8,
-	BNXT_ULP_ACT_HID_53b8 = 0x53b8,
-	BNXT_ULP_ACT_HID_3e1c = 0x3e1c,
-	BNXT_ULP_ACT_HID_712c = 0x712c,
-	BNXT_ULP_ACT_HID_0680 = 0x0680,
-	BNXT_ULP_ACT_HID_3aea = 0x3aea,
-	BNXT_ULP_ACT_HID_42ea = 0x42ea,
-	BNXT_ULP_ACT_HID_4aea = 0x4aea,
-	BNXT_ULP_ACT_HID_3afa = 0x3afa,
-	BNXT_ULP_ACT_HID_42fa = 0x42fa,
-	BNXT_ULP_ACT_HID_4afa = 0x4afa,
-	BNXT_ULP_ACT_HID_43fa = 0x43fa,
-	BNXT_ULP_ACT_HID_770a = 0x770a,
-	BNXT_ULP_ACT_HID_550a = 0x550a,
-	BNXT_ULP_ACT_HID_3f6e = 0x3f6e,
-	BNXT_ULP_ACT_HID_727e = 0x727e,
-	BNXT_ULP_ACT_HID_661a = 0x661a,
-	BNXT_ULP_ACT_HID_07d2 = 0x07d2,
-	BNXT_ULP_ACT_HID_4bfa = 0x4bfa,
-	BNXT_ULP_ACT_HID_034e = 0x034e,
-	BNXT_ULP_ACT_HID_5d0a = 0x5d0a,
-	BNXT_ULP_ACT_HID_476e = 0x476e,
-	BNXT_ULP_ACT_HID_7a7e = 0x7a7e,
-	BNXT_ULP_ACT_HID_6e1a = 0x6e1a,
-	BNXT_ULP_ACT_HID_0fd2 = 0x0fd2,
-	BNXT_ULP_ACT_HID_53fa = 0x53fa,
-	BNXT_ULP_ACT_HID_0b4e = 0x0b4e,
-	BNXT_ULP_ACT_HID_650a = 0x650a,
-	BNXT_ULP_ACT_HID_4f6e = 0x4f6e,
-	BNXT_ULP_ACT_HID_06c2 = 0x06c2,
-	BNXT_ULP_ACT_HID_761a = 0x761a,
-	BNXT_ULP_ACT_HID_17d2 = 0x17d2,
-	BNXT_ULP_ACT_HID_5bfa = 0x5bfa,
-	BNXT_ULP_ACT_HID_134e = 0x134e,
-	BNXT_ULP_ACT_HID_6d0a = 0x6d0a,
-	BNXT_ULP_ACT_HID_576e = 0x576e,
-	BNXT_ULP_ACT_HID_0ec2 = 0x0ec2,
-	BNXT_ULP_ACT_HID_025e = 0x025e,
-	BNXT_ULP_ACT_HID_1fd2 = 0x1fd2,
-	BNXT_ULP_ACT_HID_440a = 0x440a,
-	BNXT_ULP_ACT_HID_771a = 0x771a,
-	BNXT_ULP_ACT_HID_551a = 0x551a,
-	BNXT_ULP_ACT_HID_3f7e = 0x3f7e,
-	BNXT_ULP_ACT_HID_728e = 0x728e,
-	BNXT_ULP_ACT_HID_662a = 0x662a,
+	BNXT_ULP_ACT_HID_1d3c0 = 0x1d3c0,
+	BNXT_ULP_ACT_HID_25c40 = 0x25c40,
+	BNXT_ULP_ACT_HID_237a0 = 0x237a0,
+	BNXT_ULP_ACT_HID_127a0 = 0x127a0,
+	BNXT_ULP_ACT_HID_7ac0 = 0x7ac0,
+	BNXT_ULP_ACT_HID_9f20 = 0x9f20,
+	BNXT_ULP_ACT_HID_21340 = 0x21340,
+	BNXT_ULP_ACT_HID_29bc0 = 0x29bc0,
+	BNXT_ULP_ACT_HID_9fa0 = 0x9fa0,
+	BNXT_ULP_ACT_HID_23820 = 0x23820,
+	BNXT_ULP_ACT_HID_12820 = 0x12820,
+	BNXT_ULP_ACT_HID_7b40 = 0x7b40,
+	BNXT_ULP_ACT_HID_213c0 = 0x213c0,
+	BNXT_ULP_ACT_HID_29c40 = 0x29c40,
+	BNXT_ULP_ACT_HID_df20 = 0xdf20,
+	BNXT_ULP_ACT_HID_277a0 = 0x277a0,
+	BNXT_ULP_ACT_HID_167a0 = 0x167a0,
+	BNXT_ULP_ACT_HID_bac0 = 0xbac0,
+	BNXT_ULP_ACT_HID_25340 = 0x25340,
+	BNXT_ULP_ACT_HID_2dbc0 = 0x2dbc0,
+	BNXT_ULP_ACT_HID_dfa0 = 0xdfa0,
+	BNXT_ULP_ACT_HID_27820 = 0x27820,
+	BNXT_ULP_ACT_HID_16820 = 0x16820,
+	BNXT_ULP_ACT_HID_bb40 = 0xbb40,
+	BNXT_ULP_ACT_HID_253c0 = 0x253c0,
+	BNXT_ULP_ACT_HID_2dc40 = 0x2dc40,
+	BNXT_ULP_ACT_HID_11f20 = 0x11f20,
+	BNXT_ULP_ACT_HID_2b7a0 = 0x2b7a0,
+	BNXT_ULP_ACT_HID_1a7a0 = 0x1a7a0,
+	BNXT_ULP_ACT_HID_fac0 = 0xfac0,
+	BNXT_ULP_ACT_HID_29340 = 0x29340,
+	BNXT_ULP_ACT_HID_31bc0 = 0x31bc0,
+	BNXT_ULP_ACT_HID_11fa0 = 0x11fa0,
+	BNXT_ULP_ACT_HID_2b820 = 0x2b820,
+	BNXT_ULP_ACT_HID_1a820 = 0x1a820,
+	BNXT_ULP_ACT_HID_fb40 = 0xfb40,
+	BNXT_ULP_ACT_HID_293c0 = 0x293c0,
+	BNXT_ULP_ACT_HID_31c40 = 0x31c40,
+	BNXT_ULP_ACT_HID_e1a2 = 0xe1a2,
+	BNXT_ULP_ACT_HID_121a2 = 0x121a2,
+	BNXT_ULP_ACT_HID_161a2 = 0x161a2,
+	BNXT_ULP_ACT_HID_e222 = 0xe222,
+	BNXT_ULP_ACT_HID_12222 = 0x12222,
+	BNXT_ULP_ACT_HID_16222 = 0x16222,
+	BNXT_ULP_ACT_HID_12a22 = 0x12a22,
+	BNXT_ULP_ACT_HID_2c2a2 = 0x2c2a2,
+	BNXT_ULP_ACT_HID_1b2a2 = 0x1b2a2,
+	BNXT_ULP_ACT_HID_105c2 = 0x105c2,
+	BNXT_ULP_ACT_HID_29e42 = 0x29e42,
+	BNXT_ULP_ACT_HID_326c2 = 0x326c2,
+	BNXT_ULP_ACT_HID_16a22 = 0x16a22,
+	BNXT_ULP_ACT_HID_302a2 = 0x302a2,
+	BNXT_ULP_ACT_HID_1f2a2 = 0x1f2a2,
+	BNXT_ULP_ACT_HID_145c2 = 0x145c2,
+	BNXT_ULP_ACT_HID_2de42 = 0x2de42,
+	BNXT_ULP_ACT_HID_366c2 = 0x366c2,
+	BNXT_ULP_ACT_HID_1aa22 = 0x1aa22,
+	BNXT_ULP_ACT_HID_342a2 = 0x342a2,
+	BNXT_ULP_ACT_HID_232a2 = 0x232a2,
+	BNXT_ULP_ACT_HID_185c2 = 0x185c2,
+	BNXT_ULP_ACT_HID_31e42 = 0x31e42,
+	BNXT_ULP_ACT_HID_3a6c2 = 0x3a6c2,
+	BNXT_ULP_ACT_HID_1ea22 = 0x1ea22,
+	BNXT_ULP_ACT_HID_382a2 = 0x382a2,
+	BNXT_ULP_ACT_HID_272a2 = 0x272a2,
+	BNXT_ULP_ACT_HID_1c5c2 = 0x1c5c2,
+	BNXT_ULP_ACT_HID_35e42 = 0x35e42,
+	BNXT_ULP_ACT_HID_08e2 = 0x08e2,
+	BNXT_ULP_ACT_HID_12aa2 = 0x12aa2,
+	BNXT_ULP_ACT_HID_2c322 = 0x2c322,
+	BNXT_ULP_ACT_HID_1b322 = 0x1b322,
+	BNXT_ULP_ACT_HID_10642 = 0x10642,
+	BNXT_ULP_ACT_HID_29ec2 = 0x29ec2,
+	BNXT_ULP_ACT_HID_32742 = 0x32742,
+	BNXT_ULP_ACT_HID_16aa2 = 0x16aa2,
+	BNXT_ULP_ACT_HID_30322 = 0x30322,
+	BNXT_ULP_ACT_HID_1f322 = 0x1f322,
+	BNXT_ULP_ACT_HID_14642 = 0x14642,
+	BNXT_ULP_ACT_HID_2dec2 = 0x2dec2,
+	BNXT_ULP_ACT_HID_36742 = 0x36742,
+	BNXT_ULP_ACT_HID_1aaa2 = 0x1aaa2,
+	BNXT_ULP_ACT_HID_34322 = 0x34322,
+	BNXT_ULP_ACT_HID_23322 = 0x23322,
+	BNXT_ULP_ACT_HID_18642 = 0x18642,
+	BNXT_ULP_ACT_HID_31ec2 = 0x31ec2,
+	BNXT_ULP_ACT_HID_3a742 = 0x3a742,
+	BNXT_ULP_ACT_HID_1eaa2 = 0x1eaa2,
+	BNXT_ULP_ACT_HID_38322 = 0x38322,
+	BNXT_ULP_ACT_HID_27322 = 0x27322,
+	BNXT_ULP_ACT_HID_1c642 = 0x1c642,
+	BNXT_ULP_ACT_HID_35ec2 = 0x35ec2,
+	BNXT_ULP_ACT_HID_0962 = 0x0962,
+	BNXT_ULP_ACT_HID_1f662 = 0x1f662,
+	BNXT_ULP_ACT_HID_38ee2 = 0x38ee2,
+	BNXT_ULP_ACT_HID_27ee2 = 0x27ee2,
+	BNXT_ULP_ACT_HID_1d202 = 0x1d202,
+	BNXT_ULP_ACT_HID_36a82 = 0x36a82,
+	BNXT_ULP_ACT_HID_1522 = 0x1522,
+	BNXT_ULP_ACT_HID_1f6e2 = 0x1f6e2,
+	BNXT_ULP_ACT_HID_38f62 = 0x38f62,
+	BNXT_ULP_ACT_HID_27f62 = 0x27f62,
+	BNXT_ULP_ACT_HID_1d282 = 0x1d282,
+	BNXT_ULP_ACT_HID_36b02 = 0x36b02,
+	BNXT_ULP_ACT_HID_15a2 = 0x15a2,
+	BNXT_ULP_ACT_HID_3cee2 = 0x3cee2,
+	BNXT_ULP_ACT_HID_2bee2 = 0x2bee2,
+	BNXT_ULP_ACT_HID_21202 = 0x21202,
+	BNXT_ULP_ACT_HID_23662 = 0x23662,
+	BNXT_ULP_ACT_HID_3aa82 = 0x3aa82,
+	BNXT_ULP_ACT_HID_5522 = 0x5522,
+	BNXT_ULP_ACT_HID_236e2 = 0x236e2,
+	BNXT_ULP_ACT_HID_3cf62 = 0x3cf62,
+	BNXT_ULP_ACT_HID_2bf62 = 0x2bf62,
+	BNXT_ULP_ACT_HID_21282 = 0x21282,
+	BNXT_ULP_ACT_HID_3ab02 = 0x3ab02,
+	BNXT_ULP_ACT_HID_55a2 = 0x55a2,
+	BNXT_ULP_ACT_HID_27662 = 0x27662,
+	BNXT_ULP_ACT_HID_3102 = 0x3102,
+	BNXT_ULP_ACT_HID_2fee2 = 0x2fee2,
+	BNXT_ULP_ACT_HID_25202 = 0x25202,
+	BNXT_ULP_ACT_HID_0ca2 = 0x0ca2,
+	BNXT_ULP_ACT_HID_9522 = 0x9522,
+	BNXT_ULP_ACT_HID_276e2 = 0x276e2,
+	BNXT_ULP_ACT_HID_3182 = 0x3182,
+	BNXT_ULP_ACT_HID_2ff62 = 0x2ff62,
+	BNXT_ULP_ACT_HID_25282 = 0x25282,
+	BNXT_ULP_ACT_HID_0d22 = 0x0d22,
+	BNXT_ULP_ACT_HID_95a2 = 0x95a2,
+	BNXT_ULP_ACT_HID_2b662 = 0x2b662,
+	BNXT_ULP_ACT_HID_7102 = 0x7102,
+	BNXT_ULP_ACT_HID_33ee2 = 0x33ee2,
+	BNXT_ULP_ACT_HID_29202 = 0x29202,
+	BNXT_ULP_ACT_HID_4ca2 = 0x4ca2,
+	BNXT_ULP_ACT_HID_d522 = 0xd522,
+	BNXT_ULP_ACT_HID_2b6e2 = 0x2b6e2,
+	BNXT_ULP_ACT_HID_7182 = 0x7182,
+	BNXT_ULP_ACT_HID_33f62 = 0x33f62,
+	BNXT_ULP_ACT_HID_29282 = 0x29282,
+	BNXT_ULP_ACT_HID_4d22 = 0x4d22,
+	BNXT_ULP_ACT_HID_d5a2 = 0xd5a2,
+	BNXT_ULP_ACT_HID_3e4e0 = 0x3e4e0,
+	BNXT_ULP_ACT_HID_2700 = 0x2700,
+	BNXT_ULP_ACT_HID_6700 = 0x6700,
+	BNXT_ULP_ACT_HID_3e560 = 0x3e560,
+	BNXT_ULP_ACT_HID_2780 = 0x2780,
+	BNXT_ULP_ACT_HID_6780 = 0x6780,
+	BNXT_ULP_ACT_HID_2f80 = 0x2f80,
+	BNXT_ULP_ACT_HID_1e800 = 0x1e800,
+	BNXT_ULP_ACT_HID_b800 = 0xb800,
+	BNXT_ULP_ACT_HID_2b20 = 0x2b20,
+	BNXT_ULP_ACT_HID_1a3a0 = 0x1a3a0,
+	BNXT_ULP_ACT_HID_22c20 = 0x22c20,
+	BNXT_ULP_ACT_HID_6f80 = 0x6f80,
+	BNXT_ULP_ACT_HID_22800 = 0x22800,
+	BNXT_ULP_ACT_HID_f800 = 0xf800,
+	BNXT_ULP_ACT_HID_6b20 = 0x6b20,
+	BNXT_ULP_ACT_HID_1e3a0 = 0x1e3a0,
+	BNXT_ULP_ACT_HID_26c20 = 0x26c20,
+	BNXT_ULP_ACT_HID_af80 = 0xaf80,
+	BNXT_ULP_ACT_HID_26800 = 0x26800,
+	BNXT_ULP_ACT_HID_13800 = 0x13800,
+	BNXT_ULP_ACT_HID_ab20 = 0xab20,
+	BNXT_ULP_ACT_HID_223a0 = 0x223a0,
+	BNXT_ULP_ACT_HID_2ac20 = 0x2ac20,
+	BNXT_ULP_ACT_HID_ef80 = 0xef80,
+	BNXT_ULP_ACT_HID_2a800 = 0x2a800,
+	BNXT_ULP_ACT_HID_17800 = 0x17800,
+	BNXT_ULP_ACT_HID_eb20 = 0xeb20,
+	BNXT_ULP_ACT_HID_263a0 = 0x263a0,
+	BNXT_ULP_ACT_HID_2ec20 = 0x2ec20,
+	BNXT_ULP_ACT_HID_3000 = 0x3000,
+	BNXT_ULP_ACT_HID_1e880 = 0x1e880,
+	BNXT_ULP_ACT_HID_b880 = 0xb880,
+	BNXT_ULP_ACT_HID_2ba0 = 0x2ba0,
+	BNXT_ULP_ACT_HID_1a420 = 0x1a420,
+	BNXT_ULP_ACT_HID_22ca0 = 0x22ca0,
+	BNXT_ULP_ACT_HID_7000 = 0x7000,
+	BNXT_ULP_ACT_HID_22880 = 0x22880,
+	BNXT_ULP_ACT_HID_f880 = 0xf880,
+	BNXT_ULP_ACT_HID_6ba0 = 0x6ba0,
+	BNXT_ULP_ACT_HID_1e420 = 0x1e420,
+	BNXT_ULP_ACT_HID_26ca0 = 0x26ca0,
+	BNXT_ULP_ACT_HID_b000 = 0xb000,
+	BNXT_ULP_ACT_HID_26880 = 0x26880,
+	BNXT_ULP_ACT_HID_13880 = 0x13880,
+	BNXT_ULP_ACT_HID_aba0 = 0xaba0,
+	BNXT_ULP_ACT_HID_22420 = 0x22420,
+	BNXT_ULP_ACT_HID_2aca0 = 0x2aca0,
+	BNXT_ULP_ACT_HID_f000 = 0xf000,
+	BNXT_ULP_ACT_HID_2a880 = 0x2a880,
+	BNXT_ULP_ACT_HID_17880 = 0x17880,
+	BNXT_ULP_ACT_HID_eba0 = 0xeba0,
+	BNXT_ULP_ACT_HID_26420 = 0x26420,
+	BNXT_ULP_ACT_HID_2eca0 = 0x2eca0,
+	BNXT_ULP_ACT_HID_fbc0 = 0xfbc0,
+	BNXT_ULP_ACT_HID_2b440 = 0x2b440,
+	BNXT_ULP_ACT_HID_1a440 = 0x1a440,
+	BNXT_ULP_ACT_HID_f760 = 0xf760,
+	BNXT_ULP_ACT_HID_26fe0 = 0x26fe0,
+	BNXT_ULP_ACT_HID_2f860 = 0x2f860,
+	BNXT_ULP_ACT_HID_fc40 = 0xfc40,
+	BNXT_ULP_ACT_HID_2b4c0 = 0x2b4c0,
+	BNXT_ULP_ACT_HID_1a4c0 = 0x1a4c0,
+	BNXT_ULP_ACT_HID_f7e0 = 0xf7e0,
+	BNXT_ULP_ACT_HID_27060 = 0x27060,
+	BNXT_ULP_ACT_HID_2f8e0 = 0x2f8e0,
+	BNXT_ULP_ACT_HID_2f440 = 0x2f440,
+	BNXT_ULP_ACT_HID_1e440 = 0x1e440,
+	BNXT_ULP_ACT_HID_13760 = 0x13760,
+	BNXT_ULP_ACT_HID_13bc0 = 0x13bc0,
+	BNXT_ULP_ACT_HID_2afe0 = 0x2afe0,
+	BNXT_ULP_ACT_HID_33860 = 0x33860,
+	BNXT_ULP_ACT_HID_13c40 = 0x13c40,
+	BNXT_ULP_ACT_HID_2f4c0 = 0x2f4c0,
+	BNXT_ULP_ACT_HID_1e4c0 = 0x1e4c0,
+	BNXT_ULP_ACT_HID_137e0 = 0x137e0,
+	BNXT_ULP_ACT_HID_2b060 = 0x2b060,
+	BNXT_ULP_ACT_HID_338e0 = 0x338e0,
+	BNXT_ULP_ACT_HID_17bc0 = 0x17bc0,
+	BNXT_ULP_ACT_HID_33440 = 0x33440,
+	BNXT_ULP_ACT_HID_22440 = 0x22440,
+	BNXT_ULP_ACT_HID_17760 = 0x17760,
+	BNXT_ULP_ACT_HID_2efe0 = 0x2efe0,
+	BNXT_ULP_ACT_HID_37860 = 0x37860,
+	BNXT_ULP_ACT_HID_17c40 = 0x17c40,
+	BNXT_ULP_ACT_HID_334c0 = 0x334c0,
+	BNXT_ULP_ACT_HID_224c0 = 0x224c0,
+	BNXT_ULP_ACT_HID_177e0 = 0x177e0,
+	BNXT_ULP_ACT_HID_2f060 = 0x2f060,
+	BNXT_ULP_ACT_HID_378e0 = 0x378e0,
+	BNXT_ULP_ACT_HID_1bbc0 = 0x1bbc0,
+	BNXT_ULP_ACT_HID_37440 = 0x37440,
+	BNXT_ULP_ACT_HID_26440 = 0x26440,
+	BNXT_ULP_ACT_HID_1b760 = 0x1b760,
+	BNXT_ULP_ACT_HID_32fe0 = 0x32fe0,
+	BNXT_ULP_ACT_HID_3b860 = 0x3b860,
+	BNXT_ULP_ACT_HID_1bc40 = 0x1bc40,
+	BNXT_ULP_ACT_HID_374c0 = 0x374c0,
+	BNXT_ULP_ACT_HID_264c0 = 0x264c0,
+	BNXT_ULP_ACT_HID_1b7e0 = 0x1b7e0,
+	BNXT_ULP_ACT_HID_33060 = 0x33060,
+	BNXT_ULP_ACT_HID_3b8e0 = 0x3b8e0,
+	BNXT_ULP_ACT_HID_18e80 = 0x18e80,
+	BNXT_ULP_ACT_HID_18f00 = 0x18f00,
+	BNXT_ULP_ACT_HID_1ce80 = 0x1ce80,
+	BNXT_ULP_ACT_HID_1cf00 = 0x1cf00,
+	BNXT_ULP_ACT_HID_20e80 = 0x20e80,
+	BNXT_ULP_ACT_HID_20f00 = 0x20f00,
+	BNXT_ULP_ACT_HID_24e80 = 0x24e80,
+	BNXT_ULP_ACT_HID_24f00 = 0x24f00,
+	BNXT_ULP_ACT_HID_325c2 = 0x325c2,
+	BNXT_ULP_ACT_HID_32642 = 0x32642,
+	BNXT_ULP_ACT_HID_365c2 = 0x365c2,
+	BNXT_ULP_ACT_HID_36642 = 0x36642,
+	BNXT_ULP_ACT_HID_3a5c2 = 0x3a5c2,
+	BNXT_ULP_ACT_HID_3a642 = 0x3a642,
 	BNXT_ULP_ACT_HID_07e2 = 0x07e2,
-	BNXT_ULP_ACT_HID_4c0a = 0x4c0a,
-	BNXT_ULP_ACT_HID_035e = 0x035e,
-	BNXT_ULP_ACT_HID_5d1a = 0x5d1a,
-	BNXT_ULP_ACT_HID_477e = 0x477e,
-	BNXT_ULP_ACT_HID_7a8e = 0x7a8e,
-	BNXT_ULP_ACT_HID_6e2a = 0x6e2a,
-	BNXT_ULP_ACT_HID_0fe2 = 0x0fe2,
-	BNXT_ULP_ACT_HID_540a = 0x540a,
-	BNXT_ULP_ACT_HID_0b5e = 0x0b5e,
-	BNXT_ULP_ACT_HID_651a = 0x651a,
-	BNXT_ULP_ACT_HID_4f7e = 0x4f7e,
-	BNXT_ULP_ACT_HID_06d2 = 0x06d2,
-	BNXT_ULP_ACT_HID_762a = 0x762a,
-	BNXT_ULP_ACT_HID_17e2 = 0x17e2,
-	BNXT_ULP_ACT_HID_5c0a = 0x5c0a,
-	BNXT_ULP_ACT_HID_135e = 0x135e,
-	BNXT_ULP_ACT_HID_6d1a = 0x6d1a,
-	BNXT_ULP_ACT_HID_577e = 0x577e,
-	BNXT_ULP_ACT_HID_0ed2 = 0x0ed2,
-	BNXT_ULP_ACT_HID_026e = 0x026e,
-	BNXT_ULP_ACT_HID_1fe2 = 0x1fe2,
-	BNXT_ULP_ACT_HID_5d82 = 0x5d82,
-	BNXT_ULP_ACT_HID_14d6 = 0x14d6,
-	BNXT_ULP_ACT_HID_6e92 = 0x6e92,
-	BNXT_ULP_ACT_HID_58f6 = 0x58f6,
-	BNXT_ULP_ACT_HID_104a = 0x104a,
-	BNXT_ULP_ACT_HID_215a = 0x215a,
-	BNXT_ULP_ACT_HID_5d92 = 0x5d92,
-	BNXT_ULP_ACT_HID_14e6 = 0x14e6,
-	BNXT_ULP_ACT_HID_6ea2 = 0x6ea2,
-	BNXT_ULP_ACT_HID_5906 = 0x5906,
-	BNXT_ULP_ACT_HID_105a = 0x105a,
-	BNXT_ULP_ACT_HID_216a = 0x216a,
-	BNXT_ULP_ACT_HID_6582 = 0x6582,
-	BNXT_ULP_ACT_HID_1cd6 = 0x1cd6,
-	BNXT_ULP_ACT_HID_7692 = 0x7692,
-	BNXT_ULP_ACT_HID_60f6 = 0x60f6,
-	BNXT_ULP_ACT_HID_184a = 0x184a,
-	BNXT_ULP_ACT_HID_295a = 0x295a,
-	BNXT_ULP_ACT_HID_6592 = 0x6592,
-	BNXT_ULP_ACT_HID_1ce6 = 0x1ce6,
-	BNXT_ULP_ACT_HID_76a2 = 0x76a2,
-	BNXT_ULP_ACT_HID_6106 = 0x6106,
-	BNXT_ULP_ACT_HID_185a = 0x185a,
-	BNXT_ULP_ACT_HID_296a = 0x296a,
-	BNXT_ULP_ACT_HID_6d82 = 0x6d82,
-	BNXT_ULP_ACT_HID_24d6 = 0x24d6,
-	BNXT_ULP_ACT_HID_02d6 = 0x02d6,
-	BNXT_ULP_ACT_HID_68f6 = 0x68f6,
-	BNXT_ULP_ACT_HID_204a = 0x204a,
-	BNXT_ULP_ACT_HID_315a = 0x315a,
-	BNXT_ULP_ACT_HID_6d92 = 0x6d92,
-	BNXT_ULP_ACT_HID_24e6 = 0x24e6,
-	BNXT_ULP_ACT_HID_02e6 = 0x02e6,
-	BNXT_ULP_ACT_HID_6906 = 0x6906,
-	BNXT_ULP_ACT_HID_205a = 0x205a,
-	BNXT_ULP_ACT_HID_316a = 0x316a,
-	BNXT_ULP_ACT_HID_7582 = 0x7582,
-	BNXT_ULP_ACT_HID_2cd6 = 0x2cd6,
-	BNXT_ULP_ACT_HID_0ad6 = 0x0ad6,
-	BNXT_ULP_ACT_HID_70f6 = 0x70f6,
-	BNXT_ULP_ACT_HID_284a = 0x284a,
-	BNXT_ULP_ACT_HID_395a = 0x395a,
-	BNXT_ULP_ACT_HID_7592 = 0x7592,
-	BNXT_ULP_ACT_HID_2ce6 = 0x2ce6,
-	BNXT_ULP_ACT_HID_0ae6 = 0x0ae6,
-	BNXT_ULP_ACT_HID_7106 = 0x7106,
-	BNXT_ULP_ACT_HID_285a = 0x285a,
-	BNXT_ULP_ACT_HID_396a = 0x396a,
-	BNXT_ULP_ACT_HID_0020 = 0x0020,
-	BNXT_ULP_ACT_HID_0030 = 0x0030,
-	BNXT_ULP_ACT_HID_65d4 = 0x65d4,
-	BNXT_ULP_ACT_HID_65e4 = 0x65e4,
-	BNXT_ULP_ACT_HID_330a = 0x330a,
-	BNXT_ULP_ACT_HID_331a = 0x331a,
-	BNXT_ULP_ACT_HID_1cfe = 0x1cfe,
-	BNXT_ULP_ACT_HID_1d0e = 0x1d0e,
-	BNXT_ULP_ACT_HID_1474 = 0x1474,
-	BNXT_ULP_ACT_HID_4838 = 0x4838,
-	BNXT_ULP_ACT_HID_6458 = 0x6458,
-	BNXT_ULP_ACT_HID_1c68 = 0x1c68,
-	BNXT_ULP_ACT_HID_6c34 = 0x6c34,
-	BNXT_ULP_ACT_HID_5d08 = 0x5d08,
-	BNXT_ULP_ACT_HID_5d10 = 0x5d10,
-	BNXT_ULP_ACT_HID_5d20 = 0x5d20,
-	BNXT_ULP_ACT_HID_2e18 = 0x2e18,
-	BNXT_ULP_ACT_HID_29d4 = 0x29d4,
-	BNXT_ULP_ACT_HID_7690 = 0x7690,
-	BNXT_ULP_ACT_HID_47a0 = 0x47a0,
-	BNXT_ULP_ACT_HID_435c = 0x435c,
-	BNXT_ULP_ACT_HID_5d18 = 0x5d18,
-	BNXT_ULP_ACT_HID_2e28 = 0x2e28,
-	BNXT_ULP_ACT_HID_29e4 = 0x29e4,
-	BNXT_ULP_ACT_HID_76a0 = 0x76a0,
-	BNXT_ULP_ACT_HID_47b0 = 0x47b0,
-	BNXT_ULP_ACT_HID_436c = 0x436c,
-	BNXT_ULP_ACT_HID_1436 = 0x1436,
-	BNXT_ULP_ACT_HID_143e = 0x143e,
-	BNXT_ULP_ACT_HID_144e = 0x144e,
-	BNXT_ULP_ACT_HID_6102 = 0x6102,
-	BNXT_ULP_ACT_HID_5cbe = 0x5cbe,
-	BNXT_ULP_ACT_HID_2dbe = 0x2dbe,
-	BNXT_ULP_ACT_HID_7a8a = 0x7a8a,
-	BNXT_ULP_ACT_HID_7646 = 0x7646,
-	BNXT_ULP_ACT_HID_1446 = 0x1446,
-	BNXT_ULP_ACT_HID_6112 = 0x6112,
-	BNXT_ULP_ACT_HID_5cce = 0x5cce,
-	BNXT_ULP_ACT_HID_2dce = 0x2dce,
-	BNXT_ULP_ACT_HID_7a9a = 0x7a9a,
-	BNXT_ULP_ACT_HID_7656 = 0x7656,
-	BNXT_ULP_ACT_HID_6508 = 0x6508,
-	BNXT_ULP_ACT_HID_6d08 = 0x6d08,
-	BNXT_ULP_ACT_HID_7508 = 0x7508,
-	BNXT_ULP_ACT_HID_6518 = 0x6518,
-	BNXT_ULP_ACT_HID_6d18 = 0x6d18,
-	BNXT_ULP_ACT_HID_7518 = 0x7518,
-	BNXT_ULP_ACT_HID_6e18 = 0x6e18,
-	BNXT_ULP_ACT_HID_256c = 0x256c,
-	BNXT_ULP_ACT_HID_036c = 0x036c,
-	BNXT_ULP_ACT_HID_698c = 0x698c,
-	BNXT_ULP_ACT_HID_20e0 = 0x20e0,
-	BNXT_ULP_ACT_HID_31f0 = 0x31f0,
-	BNXT_ULP_ACT_HID_7618 = 0x7618,
-	BNXT_ULP_ACT_HID_2d6c = 0x2d6c,
-	BNXT_ULP_ACT_HID_0b6c = 0x0b6c,
-	BNXT_ULP_ACT_HID_718c = 0x718c,
-	BNXT_ULP_ACT_HID_28e0 = 0x28e0,
-	BNXT_ULP_ACT_HID_39f0 = 0x39f0,
-	BNXT_ULP_ACT_HID_025c = 0x025c,
-	BNXT_ULP_ACT_HID_356c = 0x356c,
-	BNXT_ULP_ACT_HID_136c = 0x136c,
-	BNXT_ULP_ACT_HID_798c = 0x798c,
-	BNXT_ULP_ACT_HID_30e0 = 0x30e0,
-	BNXT_ULP_ACT_HID_41f0 = 0x41f0,
-	BNXT_ULP_ACT_HID_0a5c = 0x0a5c,
-	BNXT_ULP_ACT_HID_3d6c = 0x3d6c,
-	BNXT_ULP_ACT_HID_1b6c = 0x1b6c,
-	BNXT_ULP_ACT_HID_05d0 = 0x05d0,
-	BNXT_ULP_ACT_HID_38e0 = 0x38e0,
-	BNXT_ULP_ACT_HID_49f0 = 0x49f0,
-	BNXT_ULP_ACT_HID_6e28 = 0x6e28,
-	BNXT_ULP_ACT_HID_257c = 0x257c,
-	BNXT_ULP_ACT_HID_037c = 0x037c,
-	BNXT_ULP_ACT_HID_699c = 0x699c,
-	BNXT_ULP_ACT_HID_20f0 = 0x20f0,
-	BNXT_ULP_ACT_HID_3200 = 0x3200,
-	BNXT_ULP_ACT_HID_7628 = 0x7628,
-	BNXT_ULP_ACT_HID_2d7c = 0x2d7c,
-	BNXT_ULP_ACT_HID_0b7c = 0x0b7c,
-	BNXT_ULP_ACT_HID_719c = 0x719c,
-	BNXT_ULP_ACT_HID_28f0 = 0x28f0,
-	BNXT_ULP_ACT_HID_3a00 = 0x3a00,
-	BNXT_ULP_ACT_HID_026c = 0x026c,
-	BNXT_ULP_ACT_HID_357c = 0x357c,
-	BNXT_ULP_ACT_HID_137c = 0x137c,
-	BNXT_ULP_ACT_HID_799c = 0x799c,
-	BNXT_ULP_ACT_HID_30f0 = 0x30f0,
-	BNXT_ULP_ACT_HID_4200 = 0x4200,
-	BNXT_ULP_ACT_HID_0a6c = 0x0a6c,
-	BNXT_ULP_ACT_HID_3d7c = 0x3d7c,
-	BNXT_ULP_ACT_HID_1b7c = 0x1b7c,
-	BNXT_ULP_ACT_HID_05e0 = 0x05e0,
-	BNXT_ULP_ACT_HID_38f0 = 0x38f0,
-	BNXT_ULP_ACT_HID_4a00 = 0x4a00,
-	BNXT_ULP_ACT_HID_0be4 = 0x0be4,
-	BNXT_ULP_ACT_HID_3ef4 = 0x3ef4,
-	BNXT_ULP_ACT_HID_1cf4 = 0x1cf4,
-	BNXT_ULP_ACT_HID_0758 = 0x0758,
-	BNXT_ULP_ACT_HID_3a68 = 0x3a68,
-	BNXT_ULP_ACT_HID_4b78 = 0x4b78,
-	BNXT_ULP_ACT_HID_0bf4 = 0x0bf4,
-	BNXT_ULP_ACT_HID_3f04 = 0x3f04,
-	BNXT_ULP_ACT_HID_1d04 = 0x1d04,
-	BNXT_ULP_ACT_HID_0768 = 0x0768,
-	BNXT_ULP_ACT_HID_3a78 = 0x3a78,
-	BNXT_ULP_ACT_HID_4b88 = 0x4b88,
-	BNXT_ULP_ACT_HID_46f4 = 0x46f4,
-	BNXT_ULP_ACT_HID_24f4 = 0x24f4,
-	BNXT_ULP_ACT_HID_0f58 = 0x0f58,
-	BNXT_ULP_ACT_HID_13e4 = 0x13e4,
-	BNXT_ULP_ACT_HID_4268 = 0x4268,
-	BNXT_ULP_ACT_HID_5378 = 0x5378,
-	BNXT_ULP_ACT_HID_13f4 = 0x13f4,
-	BNXT_ULP_ACT_HID_4704 = 0x4704,
-	BNXT_ULP_ACT_HID_2504 = 0x2504,
-	BNXT_ULP_ACT_HID_0f68 = 0x0f68,
-	BNXT_ULP_ACT_HID_4278 = 0x4278,
-	BNXT_ULP_ACT_HID_5388 = 0x5388,
-	BNXT_ULP_ACT_HID_1be4 = 0x1be4,
-	BNXT_ULP_ACT_HID_4ef4 = 0x4ef4,
-	BNXT_ULP_ACT_HID_2cf4 = 0x2cf4,
-	BNXT_ULP_ACT_HID_1758 = 0x1758,
-	BNXT_ULP_ACT_HID_4a68 = 0x4a68,
-	BNXT_ULP_ACT_HID_5b78 = 0x5b78,
-	BNXT_ULP_ACT_HID_1bf4 = 0x1bf4,
-	BNXT_ULP_ACT_HID_4f04 = 0x4f04,
-	BNXT_ULP_ACT_HID_2d04 = 0x2d04,
-	BNXT_ULP_ACT_HID_1768 = 0x1768,
-	BNXT_ULP_ACT_HID_4a78 = 0x4a78,
-	BNXT_ULP_ACT_HID_5b88 = 0x5b88,
-	BNXT_ULP_ACT_HID_23e4 = 0x23e4,
-	BNXT_ULP_ACT_HID_56f4 = 0x56f4,
-	BNXT_ULP_ACT_HID_34f4 = 0x34f4,
-	BNXT_ULP_ACT_HID_1f58 = 0x1f58,
-	BNXT_ULP_ACT_HID_5268 = 0x5268,
-	BNXT_ULP_ACT_HID_6378 = 0x6378,
-	BNXT_ULP_ACT_HID_23f4 = 0x23f4,
-	BNXT_ULP_ACT_HID_5704 = 0x5704,
-	BNXT_ULP_ACT_HID_3504 = 0x3504,
-	BNXT_ULP_ACT_HID_1f68 = 0x1f68,
-	BNXT_ULP_ACT_HID_5278 = 0x5278,
-	BNXT_ULP_ACT_HID_6388 = 0x6388,
-	BNXT_ULP_ACT_HID_1c36 = 0x1c36,
-	BNXT_ULP_ACT_HID_2436 = 0x2436,
-	BNXT_ULP_ACT_HID_2c36 = 0x2c36,
-	BNXT_ULP_ACT_HID_1c46 = 0x1c46,
-	BNXT_ULP_ACT_HID_2446 = 0x2446,
-	BNXT_ULP_ACT_HID_2c46 = 0x2c46,
-	BNXT_ULP_ACT_HID_2546 = 0x2546,
-	BNXT_ULP_ACT_HID_5856 = 0x5856,
-	BNXT_ULP_ACT_HID_3656 = 0x3656,
-	BNXT_ULP_ACT_HID_20ba = 0x20ba,
-	BNXT_ULP_ACT_HID_53ca = 0x53ca,
-	BNXT_ULP_ACT_HID_64da = 0x64da,
-	BNXT_ULP_ACT_HID_2d46 = 0x2d46,
-	BNXT_ULP_ACT_HID_6056 = 0x6056,
-	BNXT_ULP_ACT_HID_3e56 = 0x3e56,
-	BNXT_ULP_ACT_HID_28ba = 0x28ba,
-	BNXT_ULP_ACT_HID_5bca = 0x5bca,
-	BNXT_ULP_ACT_HID_6cda = 0x6cda,
-	BNXT_ULP_ACT_HID_3546 = 0x3546,
-	BNXT_ULP_ACT_HID_6856 = 0x6856,
-	BNXT_ULP_ACT_HID_4656 = 0x4656,
-	BNXT_ULP_ACT_HID_30ba = 0x30ba,
-	BNXT_ULP_ACT_HID_63ca = 0x63ca,
-	BNXT_ULP_ACT_HID_74da = 0x74da,
-	BNXT_ULP_ACT_HID_3d46 = 0x3d46,
-	BNXT_ULP_ACT_HID_7056 = 0x7056,
-	BNXT_ULP_ACT_HID_4e56 = 0x4e56,
-	BNXT_ULP_ACT_HID_38ba = 0x38ba,
-	BNXT_ULP_ACT_HID_6bca = 0x6bca,
-	BNXT_ULP_ACT_HID_011e = 0x011e,
-	BNXT_ULP_ACT_HID_2556 = 0x2556,
-	BNXT_ULP_ACT_HID_5866 = 0x5866,
-	BNXT_ULP_ACT_HID_3666 = 0x3666,
-	BNXT_ULP_ACT_HID_20ca = 0x20ca,
-	BNXT_ULP_ACT_HID_53da = 0x53da,
-	BNXT_ULP_ACT_HID_64ea = 0x64ea,
-	BNXT_ULP_ACT_HID_2d56 = 0x2d56,
-	BNXT_ULP_ACT_HID_6066 = 0x6066,
-	BNXT_ULP_ACT_HID_3e66 = 0x3e66,
-	BNXT_ULP_ACT_HID_28ca = 0x28ca,
-	BNXT_ULP_ACT_HID_5bda = 0x5bda,
-	BNXT_ULP_ACT_HID_6cea = 0x6cea,
-	BNXT_ULP_ACT_HID_3556 = 0x3556,
-	BNXT_ULP_ACT_HID_6866 = 0x6866,
-	BNXT_ULP_ACT_HID_4666 = 0x4666,
-	BNXT_ULP_ACT_HID_30ca = 0x30ca,
-	BNXT_ULP_ACT_HID_63da = 0x63da,
-	BNXT_ULP_ACT_HID_74ea = 0x74ea,
-	BNXT_ULP_ACT_HID_3d56 = 0x3d56,
-	BNXT_ULP_ACT_HID_7066 = 0x7066,
-	BNXT_ULP_ACT_HID_4e66 = 0x4e66,
-	BNXT_ULP_ACT_HID_38ca = 0x38ca,
-	BNXT_ULP_ACT_HID_6bda = 0x6bda,
-	BNXT_ULP_ACT_HID_012e = 0x012e,
-	BNXT_ULP_ACT_HID_3ece = 0x3ece,
-	BNXT_ULP_ACT_HID_71de = 0x71de,
-	BNXT_ULP_ACT_HID_4fde = 0x4fde,
-	BNXT_ULP_ACT_HID_3a42 = 0x3a42,
-	BNXT_ULP_ACT_HID_6d52 = 0x6d52,
-	BNXT_ULP_ACT_HID_02a6 = 0x02a6,
-	BNXT_ULP_ACT_HID_3ede = 0x3ede,
-	BNXT_ULP_ACT_HID_71ee = 0x71ee,
-	BNXT_ULP_ACT_HID_4fee = 0x4fee,
-	BNXT_ULP_ACT_HID_3a52 = 0x3a52,
-	BNXT_ULP_ACT_HID_6d62 = 0x6d62,
-	BNXT_ULP_ACT_HID_02b6 = 0x02b6,
-	BNXT_ULP_ACT_HID_79de = 0x79de,
-	BNXT_ULP_ACT_HID_57de = 0x57de,
-	BNXT_ULP_ACT_HID_4242 = 0x4242,
-	BNXT_ULP_ACT_HID_46ce = 0x46ce,
-	BNXT_ULP_ACT_HID_7552 = 0x7552,
-	BNXT_ULP_ACT_HID_0aa6 = 0x0aa6,
-	BNXT_ULP_ACT_HID_46de = 0x46de,
-	BNXT_ULP_ACT_HID_79ee = 0x79ee,
-	BNXT_ULP_ACT_HID_57ee = 0x57ee,
-	BNXT_ULP_ACT_HID_4252 = 0x4252,
-	BNXT_ULP_ACT_HID_7562 = 0x7562,
-	BNXT_ULP_ACT_HID_0ab6 = 0x0ab6,
-	BNXT_ULP_ACT_HID_4ece = 0x4ece,
-	BNXT_ULP_ACT_HID_0622 = 0x0622,
-	BNXT_ULP_ACT_HID_5fde = 0x5fde,
-	BNXT_ULP_ACT_HID_4a42 = 0x4a42,
-	BNXT_ULP_ACT_HID_0196 = 0x0196,
-	BNXT_ULP_ACT_HID_12a6 = 0x12a6,
-	BNXT_ULP_ACT_HID_4ede = 0x4ede,
-	BNXT_ULP_ACT_HID_0632 = 0x0632,
-	BNXT_ULP_ACT_HID_5fee = 0x5fee,
-	BNXT_ULP_ACT_HID_4a52 = 0x4a52,
-	BNXT_ULP_ACT_HID_01a6 = 0x01a6,
-	BNXT_ULP_ACT_HID_12b6 = 0x12b6,
-	BNXT_ULP_ACT_HID_56ce = 0x56ce,
-	BNXT_ULP_ACT_HID_0e22 = 0x0e22,
-	BNXT_ULP_ACT_HID_67de = 0x67de,
-	BNXT_ULP_ACT_HID_5242 = 0x5242,
-	BNXT_ULP_ACT_HID_0996 = 0x0996,
-	BNXT_ULP_ACT_HID_1aa6 = 0x1aa6,
-	BNXT_ULP_ACT_HID_56de = 0x56de,
-	BNXT_ULP_ACT_HID_0e32 = 0x0e32,
-	BNXT_ULP_ACT_HID_67ee = 0x67ee,
-	BNXT_ULP_ACT_HID_5252 = 0x5252,
-	BNXT_ULP_ACT_HID_09a6 = 0x09a6,
-	BNXT_ULP_ACT_HID_1ab6 = 0x1ab6,
-	BNXT_ULP_ACT_HID_31d0 = 0x31d0,
-	BNXT_ULP_ACT_HID_31e0 = 0x31e0,
-	BNXT_ULP_ACT_HID_39d0 = 0x39d0,
-	BNXT_ULP_ACT_HID_39e0 = 0x39e0,
-	BNXT_ULP_ACT_HID_41d0 = 0x41d0,
-	BNXT_ULP_ACT_HID_41e0 = 0x41e0,
-	BNXT_ULP_ACT_HID_49d0 = 0x49d0,
-	BNXT_ULP_ACT_HID_49e0 = 0x49e0,
-	BNXT_ULP_ACT_HID_64ba = 0x64ba,
-	BNXT_ULP_ACT_HID_64ca = 0x64ca,
-	BNXT_ULP_ACT_HID_6cba = 0x6cba,
-	BNXT_ULP_ACT_HID_6cca = 0x6cca,
-	BNXT_ULP_ACT_HID_74ba = 0x74ba,
-	BNXT_ULP_ACT_HID_74ca = 0x74ca,
-	BNXT_ULP_ACT_HID_00fe = 0x00fe,
-	BNXT_ULP_ACT_HID_010e = 0x010e,
-	BNXT_ULP_ACT_HID_331c = 0x331c,
-	BNXT_ULP_ACT_HID_332c = 0x332c,
-	BNXT_ULP_ACT_HID_6706 = 0x6706,
-	BNXT_ULP_ACT_HID_6716 = 0x6716,
-	BNXT_ULP_ACT_HID_1b6d = 0x1b6d,
-	BNXT_ULP_ACT_HID_1b7d = 0x1b7d,
-	BNXT_ULP_ACT_HID_641a = 0x641a
+	BNXT_ULP_ACT_HID_0862 = 0x0862,
+	BNXT_ULP_ACT_HID_22b20 = 0x22b20,
+	BNXT_ULP_ACT_HID_22ba0 = 0x22ba0,
+	BNXT_ULP_ACT_HID_26b20 = 0x26b20,
+	BNXT_ULP_ACT_HID_26ba0 = 0x26ba0,
+	BNXT_ULP_ACT_HID_2ab20 = 0x2ab20,
+	BNXT_ULP_ACT_HID_2aba0 = 0x2aba0,
+	BNXT_ULP_ACT_HID_2eb20 = 0x2eb20,
+	BNXT_ULP_ACT_HID_2eba0 = 0x2eba0,
+	BNXT_ULP_ACT_HID_199e0 = 0x199e0,
+	BNXT_ULP_ACT_HID_19960 = 0x19960,
+	BNXT_ULP_ACT_HID_33122 = 0x33122,
+	BNXT_ULP_ACT_HID_331a2 = 0x331a2,
+	BNXT_ULP_ACT_HID_23580 = 0x23580,
+	BNXT_ULP_ACT_HID_23700 = 0x23700,
+	BNXT_ULP_ACT_HID_db61 = 0xdb61,
+	BNXT_ULP_ACT_HID_dbe1 = 0xdbe1,
+	BNXT_ULP_ACT_HID_320ca = 0x320ca
 };
 
 enum bnxt_ulp_df_tpl {
@@ -3879,3 +4105,4 @@ enum bnxt_ulp_df_tpl {
 };
 
 #endif
+
diff --git a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_field.h b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_field.h
index 73cd7762e5..fada6a6283 100644
--- a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_field.h
+++ b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_field.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2014-2023 Broadcom
+ * Copyright(c) 2014-2024 Broadcom
  * All rights reserved.
  */
 
@@ -122,7 +122,12 @@ enum bnxt_ulp_glb_hf {
 	BNXT_ULP_GLB_HF_ID_T_VXLAN_FLAGS,
 	BNXT_ULP_GLB_HF_ID_T_VXLAN_RSVD0,
 	BNXT_ULP_GLB_HF_ID_T_VXLAN_VNI,
-	BNXT_ULP_GLB_HF_ID_T_VXLAN_RSVD1
+	BNXT_ULP_GLB_HF_ID_T_VXLAN_RSVD1,
+	BNXT_ULP_GLB_HF_ID_T_VXLAN_GPE_FLAGS,
+	BNXT_ULP_GLB_HF_ID_T_VXLAN_GPE_RSVD0,
+	BNXT_ULP_GLB_HF_ID_T_VXLAN_GPE_NEXT_PROTO,
+	BNXT_ULP_GLB_HF_ID_T_VXLAN_GPE_VNI,
+	BNXT_ULP_GLB_HF_ID_T_VXLAN_GPE_RSVD1
 };
 
 enum bnxt_ulp_hf_0_1_0_bitmask {
@@ -425,868 +430,868 @@ enum bnxt_ulp_hf_0_1_12_bitmask {
 	BNXT_ULP_HF_0_1_12_BITMASK_T_VXLAN_RSVD1      = 0x0000020000000000
 };
 
-enum bnxt_ulp_hf_0_2_0_bitmask {
-	BNXT_ULP_HF_0_2_0_BITMASK_WM                  = 0x8000000000000000,
-	BNXT_ULP_HF_0_2_0_BITMASK_SVIF_INDEX          = 0x4000000000000000,
-	BNXT_ULP_HF_0_2_0_BITMASK_O_ETH_DMAC          = 0x2000000000000000,
-	BNXT_ULP_HF_0_2_0_BITMASK_O_ETH_SMAC          = 0x1000000000000000,
-	BNXT_ULP_HF_0_2_0_BITMASK_O_ETH_TYPE          = 0x0800000000000000,
-	BNXT_ULP_HF_0_2_0_BITMASK_O_IPV6_VER          = 0x0400000000000000,
-	BNXT_ULP_HF_0_2_0_BITMASK_O_IPV6_TC           = 0x0200000000000000,
-	BNXT_ULP_HF_0_2_0_BITMASK_O_IPV6_FLOW_LABEL   = 0x0100000000000000,
-	BNXT_ULP_HF_0_2_0_BITMASK_O_IPV6_PAYLOAD_LEN  = 0x0080000000000000,
-	BNXT_ULP_HF_0_2_0_BITMASK_O_IPV6_PROTO_ID     = 0x0040000000000000,
-	BNXT_ULP_HF_0_2_0_BITMASK_O_IPV6_TTL          = 0x0020000000000000,
-	BNXT_ULP_HF_0_2_0_BITMASK_O_IPV6_SRC_ADDR     = 0x0010000000000000,
-	BNXT_ULP_HF_0_2_0_BITMASK_O_IPV6_DST_ADDR     = 0x0008000000000000,
-	BNXT_ULP_HF_0_2_0_BITMASK_O_UDP_SRC_PORT      = 0x0004000000000000,
-	BNXT_ULP_HF_0_2_0_BITMASK_O_UDP_DST_PORT      = 0x0002000000000000,
-	BNXT_ULP_HF_0_2_0_BITMASK_O_UDP_LENGTH        = 0x0001000000000000,
-	BNXT_ULP_HF_0_2_0_BITMASK_O_UDP_CSUM          = 0x0000800000000000,
-	BNXT_ULP_HF_0_2_0_BITMASK_T_VXLAN_FLAGS       = 0x0000400000000000,
-	BNXT_ULP_HF_0_2_0_BITMASK_T_VXLAN_RSVD0       = 0x0000200000000000,
-	BNXT_ULP_HF_0_2_0_BITMASK_T_VXLAN_VNI         = 0x0000100000000000,
-	BNXT_ULP_HF_0_2_0_BITMASK_T_VXLAN_RSVD1       = 0x0000080000000000
+enum bnxt_ulp_hf_0_2_13_bitmask {
+	BNXT_ULP_HF_0_2_13_BITMASK_WM                 = 0x8000000000000000,
+	BNXT_ULP_HF_0_2_13_BITMASK_SVIF_INDEX         = 0x4000000000000000,
+	BNXT_ULP_HF_0_2_13_BITMASK_O_ETH_DMAC         = 0x2000000000000000,
+	BNXT_ULP_HF_0_2_13_BITMASK_O_ETH_SMAC         = 0x1000000000000000,
+	BNXT_ULP_HF_0_2_13_BITMASK_O_ETH_TYPE         = 0x0800000000000000,
+	BNXT_ULP_HF_0_2_13_BITMASK_O_IPV6_VER         = 0x0400000000000000,
+	BNXT_ULP_HF_0_2_13_BITMASK_O_IPV6_TC          = 0x0200000000000000,
+	BNXT_ULP_HF_0_2_13_BITMASK_O_IPV6_FLOW_LABEL  = 0x0100000000000000,
+	BNXT_ULP_HF_0_2_13_BITMASK_O_IPV6_PAYLOAD_LEN = 0x0080000000000000,
+	BNXT_ULP_HF_0_2_13_BITMASK_O_IPV6_PROTO_ID    = 0x0040000000000000,
+	BNXT_ULP_HF_0_2_13_BITMASK_O_IPV6_TTL         = 0x0020000000000000,
+	BNXT_ULP_HF_0_2_13_BITMASK_O_IPV6_SRC_ADDR    = 0x0010000000000000,
+	BNXT_ULP_HF_0_2_13_BITMASK_O_IPV6_DST_ADDR    = 0x0008000000000000,
+	BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_SRC_PORT     = 0x0004000000000000,
+	BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT     = 0x0002000000000000,
+	BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_LENGTH       = 0x0001000000000000,
+	BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_CSUM         = 0x0000800000000000,
+	BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_FLAGS      = 0x0000400000000000,
+	BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_RSVD0      = 0x0000200000000000,
+	BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI        = 0x0000100000000000,
+	BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_RSVD1      = 0x0000080000000000
 };
 
-enum bnxt_ulp_hf_0_2_1_bitmask {
-	BNXT_ULP_HF_0_2_1_BITMASK_WM                  = 0x8000000000000000,
-	BNXT_ULP_HF_0_2_1_BITMASK_SVIF_INDEX          = 0x4000000000000000,
-	BNXT_ULP_HF_0_2_1_BITMASK_O_ETH_DMAC          = 0x2000000000000000,
-	BNXT_ULP_HF_0_2_1_BITMASK_O_ETH_SMAC          = 0x1000000000000000,
-	BNXT_ULP_HF_0_2_1_BITMASK_O_ETH_TYPE          = 0x0800000000000000,
-	BNXT_ULP_HF_0_2_1_BITMASK_O_IPV4_VER          = 0x0400000000000000,
-	BNXT_ULP_HF_0_2_1_BITMASK_O_IPV4_TOS          = 0x0200000000000000,
-	BNXT_ULP_HF_0_2_1_BITMASK_O_IPV4_LEN          = 0x0100000000000000,
-	BNXT_ULP_HF_0_2_1_BITMASK_O_IPV4_FRAG_ID      = 0x0080000000000000,
-	BNXT_ULP_HF_0_2_1_BITMASK_O_IPV4_FRAG_OFF     = 0x0040000000000000,
-	BNXT_ULP_HF_0_2_1_BITMASK_O_IPV4_TTL          = 0x0020000000000000,
-	BNXT_ULP_HF_0_2_1_BITMASK_O_IPV4_PROTO_ID     = 0x0010000000000000,
-	BNXT_ULP_HF_0_2_1_BITMASK_O_IPV4_CSUM         = 0x0008000000000000,
-	BNXT_ULP_HF_0_2_1_BITMASK_O_IPV4_SRC_ADDR     = 0x0004000000000000,
-	BNXT_ULP_HF_0_2_1_BITMASK_O_IPV4_DST_ADDR     = 0x0002000000000000,
-	BNXT_ULP_HF_0_2_1_BITMASK_O_UDP_SRC_PORT      = 0x0001000000000000,
-	BNXT_ULP_HF_0_2_1_BITMASK_O_UDP_DST_PORT      = 0x0000800000000000,
-	BNXT_ULP_HF_0_2_1_BITMASK_O_UDP_LENGTH        = 0x0000400000000000,
-	BNXT_ULP_HF_0_2_1_BITMASK_O_UDP_CSUM          = 0x0000200000000000,
-	BNXT_ULP_HF_0_2_1_BITMASK_T_VXLAN_FLAGS       = 0x0000100000000000,
-	BNXT_ULP_HF_0_2_1_BITMASK_T_VXLAN_RSVD0       = 0x0000080000000000,
-	BNXT_ULP_HF_0_2_1_BITMASK_T_VXLAN_VNI         = 0x0000040000000000,
-	BNXT_ULP_HF_0_2_1_BITMASK_T_VXLAN_RSVD1       = 0x0000020000000000
+enum bnxt_ulp_hf_0_2_14_bitmask {
+	BNXT_ULP_HF_0_2_14_BITMASK_WM                 = 0x8000000000000000,
+	BNXT_ULP_HF_0_2_14_BITMASK_SVIF_INDEX         = 0x4000000000000000,
+	BNXT_ULP_HF_0_2_14_BITMASK_O_ETH_DMAC         = 0x2000000000000000,
+	BNXT_ULP_HF_0_2_14_BITMASK_O_ETH_SMAC         = 0x1000000000000000,
+	BNXT_ULP_HF_0_2_14_BITMASK_O_ETH_TYPE         = 0x0800000000000000,
+	BNXT_ULP_HF_0_2_14_BITMASK_O_IPV4_VER         = 0x0400000000000000,
+	BNXT_ULP_HF_0_2_14_BITMASK_O_IPV4_TOS         = 0x0200000000000000,
+	BNXT_ULP_HF_0_2_14_BITMASK_O_IPV4_LEN         = 0x0100000000000000,
+	BNXT_ULP_HF_0_2_14_BITMASK_O_IPV4_FRAG_ID     = 0x0080000000000000,
+	BNXT_ULP_HF_0_2_14_BITMASK_O_IPV4_FRAG_OFF    = 0x0040000000000000,
+	BNXT_ULP_HF_0_2_14_BITMASK_O_IPV4_TTL         = 0x0020000000000000,
+	BNXT_ULP_HF_0_2_14_BITMASK_O_IPV4_PROTO_ID    = 0x0010000000000000,
+	BNXT_ULP_HF_0_2_14_BITMASK_O_IPV4_CSUM        = 0x0008000000000000,
+	BNXT_ULP_HF_0_2_14_BITMASK_O_IPV4_SRC_ADDR    = 0x0004000000000000,
+	BNXT_ULP_HF_0_2_14_BITMASK_O_IPV4_DST_ADDR    = 0x0002000000000000,
+	BNXT_ULP_HF_0_2_14_BITMASK_O_UDP_SRC_PORT     = 0x0001000000000000,
+	BNXT_ULP_HF_0_2_14_BITMASK_O_UDP_DST_PORT     = 0x0000800000000000,
+	BNXT_ULP_HF_0_2_14_BITMASK_O_UDP_LENGTH       = 0x0000400000000000,
+	BNXT_ULP_HF_0_2_14_BITMASK_O_UDP_CSUM         = 0x0000200000000000,
+	BNXT_ULP_HF_0_2_14_BITMASK_T_VXLAN_FLAGS      = 0x0000100000000000,
+	BNXT_ULP_HF_0_2_14_BITMASK_T_VXLAN_RSVD0      = 0x0000080000000000,
+	BNXT_ULP_HF_0_2_14_BITMASK_T_VXLAN_VNI        = 0x0000040000000000,
+	BNXT_ULP_HF_0_2_14_BITMASK_T_VXLAN_RSVD1      = 0x0000020000000000
 };
 
-enum bnxt_ulp_hf_0_2_2_bitmask {
-	BNXT_ULP_HF_0_2_2_BITMASK_WM                  = 0x8000000000000000,
-	BNXT_ULP_HF_0_2_2_BITMASK_SVIF_INDEX          = 0x4000000000000000,
-	BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_VER          = 0x2000000000000000,
-	BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_TC           = 0x1000000000000000,
-	BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_FLOW_LABEL   = 0x0800000000000000,
-	BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_PAYLOAD_LEN  = 0x0400000000000000,
-	BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_PROTO_ID     = 0x0200000000000000,
-	BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_TTL          = 0x0100000000000000,
-	BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_SRC_ADDR     = 0x0080000000000000,
-	BNXT_ULP_HF_0_2_2_BITMASK_O_IPV6_DST_ADDR     = 0x0040000000000000,
-	BNXT_ULP_HF_0_2_2_BITMASK_O_UDP_SRC_PORT      = 0x0020000000000000,
-	BNXT_ULP_HF_0_2_2_BITMASK_O_UDP_DST_PORT      = 0x0010000000000000,
-	BNXT_ULP_HF_0_2_2_BITMASK_O_UDP_LENGTH        = 0x0008000000000000,
-	BNXT_ULP_HF_0_2_2_BITMASK_O_UDP_CSUM          = 0x0004000000000000,
-	BNXT_ULP_HF_0_2_2_BITMASK_T_VXLAN_FLAGS       = 0x0002000000000000,
-	BNXT_ULP_HF_0_2_2_BITMASK_T_VXLAN_RSVD0       = 0x0001000000000000,
-	BNXT_ULP_HF_0_2_2_BITMASK_T_VXLAN_VNI         = 0x0000800000000000,
-	BNXT_ULP_HF_0_2_2_BITMASK_T_VXLAN_RSVD1       = 0x0000400000000000,
-	BNXT_ULP_HF_0_2_2_BITMASK_I_ETH_DMAC          = 0x0000200000000000,
-	BNXT_ULP_HF_0_2_2_BITMASK_I_ETH_SMAC          = 0x0000100000000000,
-	BNXT_ULP_HF_0_2_2_BITMASK_I_ETH_TYPE          = 0x0000080000000000,
-	BNXT_ULP_HF_0_2_2_BITMASK_I_IPV6_VER          = 0x0000040000000000,
-	BNXT_ULP_HF_0_2_2_BITMASK_I_IPV6_TC           = 0x0000020000000000,
-	BNXT_ULP_HF_0_2_2_BITMASK_I_IPV6_FLOW_LABEL   = 0x0000010000000000,
-	BNXT_ULP_HF_0_2_2_BITMASK_I_IPV6_PAYLOAD_LEN  = 0x0000008000000000,
-	BNXT_ULP_HF_0_2_2_BITMASK_I_IPV6_PROTO_ID     = 0x0000004000000000,
-	BNXT_ULP_HF_0_2_2_BITMASK_I_IPV6_TTL          = 0x0000002000000000,
-	BNXT_ULP_HF_0_2_2_BITMASK_I_IPV6_SRC_ADDR     = 0x0000001000000000,
-	BNXT_ULP_HF_0_2_2_BITMASK_I_IPV6_DST_ADDR     = 0x0000000800000000
+enum bnxt_ulp_hf_0_2_15_bitmask {
+	BNXT_ULP_HF_0_2_15_BITMASK_WM                 = 0x8000000000000000,
+	BNXT_ULP_HF_0_2_15_BITMASK_SVIF_INDEX         = 0x4000000000000000,
+	BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_VER         = 0x2000000000000000,
+	BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_TC          = 0x1000000000000000,
+	BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_FLOW_LABEL  = 0x0800000000000000,
+	BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_PAYLOAD_LEN = 0x0400000000000000,
+	BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_PROTO_ID    = 0x0200000000000000,
+	BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_TTL         = 0x0100000000000000,
+	BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_SRC_ADDR    = 0x0080000000000000,
+	BNXT_ULP_HF_0_2_15_BITMASK_O_IPV6_DST_ADDR    = 0x0040000000000000,
+	BNXT_ULP_HF_0_2_15_BITMASK_O_UDP_SRC_PORT     = 0x0020000000000000,
+	BNXT_ULP_HF_0_2_15_BITMASK_O_UDP_DST_PORT     = 0x0010000000000000,
+	BNXT_ULP_HF_0_2_15_BITMASK_O_UDP_LENGTH       = 0x0008000000000000,
+	BNXT_ULP_HF_0_2_15_BITMASK_O_UDP_CSUM         = 0x0004000000000000,
+	BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_FLAGS      = 0x0002000000000000,
+	BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_RSVD0      = 0x0001000000000000,
+	BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI        = 0x0000800000000000,
+	BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_RSVD1      = 0x0000400000000000,
+	BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_DMAC         = 0x0000200000000000,
+	BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_SMAC         = 0x0000100000000000,
+	BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_TYPE         = 0x0000080000000000,
+	BNXT_ULP_HF_0_2_15_BITMASK_I_IPV6_VER         = 0x0000040000000000,
+	BNXT_ULP_HF_0_2_15_BITMASK_I_IPV6_TC          = 0x0000020000000000,
+	BNXT_ULP_HF_0_2_15_BITMASK_I_IPV6_FLOW_LABEL  = 0x0000010000000000,
+	BNXT_ULP_HF_0_2_15_BITMASK_I_IPV6_PAYLOAD_LEN = 0x0000008000000000,
+	BNXT_ULP_HF_0_2_15_BITMASK_I_IPV6_PROTO_ID    = 0x0000004000000000,
+	BNXT_ULP_HF_0_2_15_BITMASK_I_IPV6_TTL         = 0x0000002000000000,
+	BNXT_ULP_HF_0_2_15_BITMASK_I_IPV6_SRC_ADDR    = 0x0000001000000000,
+	BNXT_ULP_HF_0_2_15_BITMASK_I_IPV6_DST_ADDR    = 0x0000000800000000
 };
 
-enum bnxt_ulp_hf_0_2_3_bitmask {
-	BNXT_ULP_HF_0_2_3_BITMASK_WM                  = 0x8000000000000000,
-	BNXT_ULP_HF_0_2_3_BITMASK_SVIF_INDEX          = 0x4000000000000000,
-	BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_VER          = 0x2000000000000000,
-	BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_TOS          = 0x1000000000000000,
-	BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_LEN          = 0x0800000000000000,
-	BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_FRAG_ID      = 0x0400000000000000,
-	BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_FRAG_OFF     = 0x0200000000000000,
-	BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_TTL          = 0x0100000000000000,
-	BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_PROTO_ID     = 0x0080000000000000,
-	BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_CSUM         = 0x0040000000000000,
-	BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_SRC_ADDR     = 0x0020000000000000,
-	BNXT_ULP_HF_0_2_3_BITMASK_O_IPV4_DST_ADDR     = 0x0010000000000000,
-	BNXT_ULP_HF_0_2_3_BITMASK_O_UDP_SRC_PORT      = 0x0008000000000000,
-	BNXT_ULP_HF_0_2_3_BITMASK_O_UDP_DST_PORT      = 0x0004000000000000,
-	BNXT_ULP_HF_0_2_3_BITMASK_O_UDP_LENGTH        = 0x0002000000000000,
-	BNXT_ULP_HF_0_2_3_BITMASK_O_UDP_CSUM          = 0x0001000000000000,
-	BNXT_ULP_HF_0_2_3_BITMASK_T_VXLAN_FLAGS       = 0x0000800000000000,
-	BNXT_ULP_HF_0_2_3_BITMASK_T_VXLAN_RSVD0       = 0x0000400000000000,
-	BNXT_ULP_HF_0_2_3_BITMASK_T_VXLAN_VNI         = 0x0000200000000000,
-	BNXT_ULP_HF_0_2_3_BITMASK_T_VXLAN_RSVD1       = 0x0000100000000000,
-	BNXT_ULP_HF_0_2_3_BITMASK_I_ETH_DMAC          = 0x0000080000000000,
-	BNXT_ULP_HF_0_2_3_BITMASK_I_ETH_SMAC          = 0x0000040000000000,
-	BNXT_ULP_HF_0_2_3_BITMASK_I_ETH_TYPE          = 0x0000020000000000,
-	BNXT_ULP_HF_0_2_3_BITMASK_I_IPV6_VER          = 0x0000010000000000,
-	BNXT_ULP_HF_0_2_3_BITMASK_I_IPV6_TC           = 0x0000008000000000,
-	BNXT_ULP_HF_0_2_3_BITMASK_I_IPV6_FLOW_LABEL   = 0x0000004000000000,
-	BNXT_ULP_HF_0_2_3_BITMASK_I_IPV6_PAYLOAD_LEN  = 0x0000002000000000,
-	BNXT_ULP_HF_0_2_3_BITMASK_I_IPV6_PROTO_ID     = 0x0000001000000000,
-	BNXT_ULP_HF_0_2_3_BITMASK_I_IPV6_TTL          = 0x0000000800000000,
-	BNXT_ULP_HF_0_2_3_BITMASK_I_IPV6_SRC_ADDR     = 0x0000000400000000,
-	BNXT_ULP_HF_0_2_3_BITMASK_I_IPV6_DST_ADDR     = 0x0000000200000000
+enum bnxt_ulp_hf_0_2_16_bitmask {
+	BNXT_ULP_HF_0_2_16_BITMASK_WM                 = 0x8000000000000000,
+	BNXT_ULP_HF_0_2_16_BITMASK_SVIF_INDEX         = 0x4000000000000000,
+	BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_VER         = 0x2000000000000000,
+	BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_TOS         = 0x1000000000000000,
+	BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_LEN         = 0x0800000000000000,
+	BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_FRAG_ID     = 0x0400000000000000,
+	BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_FRAG_OFF    = 0x0200000000000000,
+	BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_TTL         = 0x0100000000000000,
+	BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_PROTO_ID    = 0x0080000000000000,
+	BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_CSUM        = 0x0040000000000000,
+	BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_SRC_ADDR    = 0x0020000000000000,
+	BNXT_ULP_HF_0_2_16_BITMASK_O_IPV4_DST_ADDR    = 0x0010000000000000,
+	BNXT_ULP_HF_0_2_16_BITMASK_O_UDP_SRC_PORT     = 0x0008000000000000,
+	BNXT_ULP_HF_0_2_16_BITMASK_O_UDP_DST_PORT     = 0x0004000000000000,
+	BNXT_ULP_HF_0_2_16_BITMASK_O_UDP_LENGTH       = 0x0002000000000000,
+	BNXT_ULP_HF_0_2_16_BITMASK_O_UDP_CSUM         = 0x0001000000000000,
+	BNXT_ULP_HF_0_2_16_BITMASK_T_VXLAN_FLAGS      = 0x0000800000000000,
+	BNXT_ULP_HF_0_2_16_BITMASK_T_VXLAN_RSVD0      = 0x0000400000000000,
+	BNXT_ULP_HF_0_2_16_BITMASK_T_VXLAN_VNI        = 0x0000200000000000,
+	BNXT_ULP_HF_0_2_16_BITMASK_T_VXLAN_RSVD1      = 0x0000100000000000,
+	BNXT_ULP_HF_0_2_16_BITMASK_I_ETH_DMAC         = 0x0000080000000000,
+	BNXT_ULP_HF_0_2_16_BITMASK_I_ETH_SMAC         = 0x0000040000000000,
+	BNXT_ULP_HF_0_2_16_BITMASK_I_ETH_TYPE         = 0x0000020000000000,
+	BNXT_ULP_HF_0_2_16_BITMASK_I_IPV6_VER         = 0x0000010000000000,
+	BNXT_ULP_HF_0_2_16_BITMASK_I_IPV6_TC          = 0x0000008000000000,
+	BNXT_ULP_HF_0_2_16_BITMASK_I_IPV6_FLOW_LABEL  = 0x0000004000000000,
+	BNXT_ULP_HF_0_2_16_BITMASK_I_IPV6_PAYLOAD_LEN = 0x0000002000000000,
+	BNXT_ULP_HF_0_2_16_BITMASK_I_IPV6_PROTO_ID    = 0x0000001000000000,
+	BNXT_ULP_HF_0_2_16_BITMASK_I_IPV6_TTL         = 0x0000000800000000,
+	BNXT_ULP_HF_0_2_16_BITMASK_I_IPV6_SRC_ADDR    = 0x0000000400000000,
+	BNXT_ULP_HF_0_2_16_BITMASK_I_IPV6_DST_ADDR    = 0x0000000200000000
 };
 
-enum bnxt_ulp_hf_0_2_4_bitmask {
-	BNXT_ULP_HF_0_2_4_BITMASK_WM                  = 0x8000000000000000,
-	BNXT_ULP_HF_0_2_4_BITMASK_SVIF_INDEX          = 0x4000000000000000,
-	BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_VER          = 0x2000000000000000,
-	BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_TC           = 0x1000000000000000,
-	BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_FLOW_LABEL   = 0x0800000000000000,
-	BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_PAYLOAD_LEN  = 0x0400000000000000,
-	BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_PROTO_ID     = 0x0200000000000000,
-	BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_TTL          = 0x0100000000000000,
-	BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_SRC_ADDR     = 0x0080000000000000,
-	BNXT_ULP_HF_0_2_4_BITMASK_O_IPV6_DST_ADDR     = 0x0040000000000000,
-	BNXT_ULP_HF_0_2_4_BITMASK_O_UDP_SRC_PORT      = 0x0020000000000000,
-	BNXT_ULP_HF_0_2_4_BITMASK_O_UDP_DST_PORT      = 0x0010000000000000,
-	BNXT_ULP_HF_0_2_4_BITMASK_O_UDP_LENGTH        = 0x0008000000000000,
-	BNXT_ULP_HF_0_2_4_BITMASK_O_UDP_CSUM          = 0x0004000000000000,
-	BNXT_ULP_HF_0_2_4_BITMASK_T_VXLAN_FLAGS       = 0x0002000000000000,
-	BNXT_ULP_HF_0_2_4_BITMASK_T_VXLAN_RSVD0       = 0x0001000000000000,
-	BNXT_ULP_HF_0_2_4_BITMASK_T_VXLAN_VNI         = 0x0000800000000000,
-	BNXT_ULP_HF_0_2_4_BITMASK_T_VXLAN_RSVD1       = 0x0000400000000000,
-	BNXT_ULP_HF_0_2_4_BITMASK_I_ETH_DMAC          = 0x0000200000000000,
-	BNXT_ULP_HF_0_2_4_BITMASK_I_ETH_SMAC          = 0x0000100000000000,
-	BNXT_ULP_HF_0_2_4_BITMASK_I_ETH_TYPE          = 0x0000080000000000,
-	BNXT_ULP_HF_0_2_4_BITMASK_I_IPV4_VER          = 0x0000040000000000,
-	BNXT_ULP_HF_0_2_4_BITMASK_I_IPV4_TOS          = 0x0000020000000000,
-	BNXT_ULP_HF_0_2_4_BITMASK_I_IPV4_LEN          = 0x0000010000000000,
-	BNXT_ULP_HF_0_2_4_BITMASK_I_IPV4_FRAG_ID      = 0x0000008000000000,
-	BNXT_ULP_HF_0_2_4_BITMASK_I_IPV4_FRAG_OFF     = 0x0000004000000000,
-	BNXT_ULP_HF_0_2_4_BITMASK_I_IPV4_TTL          = 0x0000002000000000,
-	BNXT_ULP_HF_0_2_4_BITMASK_I_IPV4_PROTO_ID     = 0x0000001000000000,
-	BNXT_ULP_HF_0_2_4_BITMASK_I_IPV4_CSUM         = 0x0000000800000000,
-	BNXT_ULP_HF_0_2_4_BITMASK_I_IPV4_SRC_ADDR     = 0x0000000400000000,
-	BNXT_ULP_HF_0_2_4_BITMASK_I_IPV4_DST_ADDR     = 0x0000000200000000
+enum bnxt_ulp_hf_0_2_17_bitmask {
+	BNXT_ULP_HF_0_2_17_BITMASK_WM                 = 0x8000000000000000,
+	BNXT_ULP_HF_0_2_17_BITMASK_SVIF_INDEX         = 0x4000000000000000,
+	BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_VER         = 0x2000000000000000,
+	BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_TC          = 0x1000000000000000,
+	BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_FLOW_LABEL  = 0x0800000000000000,
+	BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_PAYLOAD_LEN = 0x0400000000000000,
+	BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_PROTO_ID    = 0x0200000000000000,
+	BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_TTL         = 0x0100000000000000,
+	BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_SRC_ADDR    = 0x0080000000000000,
+	BNXT_ULP_HF_0_2_17_BITMASK_O_IPV6_DST_ADDR    = 0x0040000000000000,
+	BNXT_ULP_HF_0_2_17_BITMASK_O_UDP_SRC_PORT     = 0x0020000000000000,
+	BNXT_ULP_HF_0_2_17_BITMASK_O_UDP_DST_PORT     = 0x0010000000000000,
+	BNXT_ULP_HF_0_2_17_BITMASK_O_UDP_LENGTH       = 0x0008000000000000,
+	BNXT_ULP_HF_0_2_17_BITMASK_O_UDP_CSUM         = 0x0004000000000000,
+	BNXT_ULP_HF_0_2_17_BITMASK_T_VXLAN_FLAGS      = 0x0002000000000000,
+	BNXT_ULP_HF_0_2_17_BITMASK_T_VXLAN_RSVD0      = 0x0001000000000000,
+	BNXT_ULP_HF_0_2_17_BITMASK_T_VXLAN_VNI        = 0x0000800000000000,
+	BNXT_ULP_HF_0_2_17_BITMASK_T_VXLAN_RSVD1      = 0x0000400000000000,
+	BNXT_ULP_HF_0_2_17_BITMASK_I_ETH_DMAC         = 0x0000200000000000,
+	BNXT_ULP_HF_0_2_17_BITMASK_I_ETH_SMAC         = 0x0000100000000000,
+	BNXT_ULP_HF_0_2_17_BITMASK_I_ETH_TYPE         = 0x0000080000000000,
+	BNXT_ULP_HF_0_2_17_BITMASK_I_IPV4_VER         = 0x0000040000000000,
+	BNXT_ULP_HF_0_2_17_BITMASK_I_IPV4_TOS         = 0x0000020000000000,
+	BNXT_ULP_HF_0_2_17_BITMASK_I_IPV4_LEN         = 0x0000010000000000,
+	BNXT_ULP_HF_0_2_17_BITMASK_I_IPV4_FRAG_ID     = 0x0000008000000000,
+	BNXT_ULP_HF_0_2_17_BITMASK_I_IPV4_FRAG_OFF    = 0x0000004000000000,
+	BNXT_ULP_HF_0_2_17_BITMASK_I_IPV4_TTL         = 0x0000002000000000,
+	BNXT_ULP_HF_0_2_17_BITMASK_I_IPV4_PROTO_ID    = 0x0000001000000000,
+	BNXT_ULP_HF_0_2_17_BITMASK_I_IPV4_CSUM        = 0x0000000800000000,
+	BNXT_ULP_HF_0_2_17_BITMASK_I_IPV4_SRC_ADDR    = 0x0000000400000000,
+	BNXT_ULP_HF_0_2_17_BITMASK_I_IPV4_DST_ADDR    = 0x0000000200000000
 };
 
-enum bnxt_ulp_hf_0_2_5_bitmask {
-	BNXT_ULP_HF_0_2_5_BITMASK_WM                  = 0x8000000000000000,
-	BNXT_ULP_HF_0_2_5_BITMASK_SVIF_INDEX          = 0x4000000000000000,
-	BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_VER          = 0x2000000000000000,
-	BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_TOS          = 0x1000000000000000,
-	BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_LEN          = 0x0800000000000000,
-	BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_FRAG_ID      = 0x0400000000000000,
-	BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_FRAG_OFF     = 0x0200000000000000,
-	BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_TTL          = 0x0100000000000000,
-	BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_PROTO_ID     = 0x0080000000000000,
-	BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_CSUM         = 0x0040000000000000,
-	BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_SRC_ADDR     = 0x0020000000000000,
-	BNXT_ULP_HF_0_2_5_BITMASK_O_IPV4_DST_ADDR     = 0x0010000000000000,
-	BNXT_ULP_HF_0_2_5_BITMASK_O_UDP_SRC_PORT      = 0x0008000000000000,
-	BNXT_ULP_HF_0_2_5_BITMASK_O_UDP_DST_PORT      = 0x0004000000000000,
-	BNXT_ULP_HF_0_2_5_BITMASK_O_UDP_LENGTH        = 0x0002000000000000,
-	BNXT_ULP_HF_0_2_5_BITMASK_O_UDP_CSUM          = 0x0001000000000000,
-	BNXT_ULP_HF_0_2_5_BITMASK_T_VXLAN_FLAGS       = 0x0000800000000000,
-	BNXT_ULP_HF_0_2_5_BITMASK_T_VXLAN_RSVD0       = 0x0000400000000000,
-	BNXT_ULP_HF_0_2_5_BITMASK_T_VXLAN_VNI         = 0x0000200000000000,
-	BNXT_ULP_HF_0_2_5_BITMASK_T_VXLAN_RSVD1       = 0x0000100000000000,
-	BNXT_ULP_HF_0_2_5_BITMASK_I_ETH_DMAC          = 0x0000080000000000,
-	BNXT_ULP_HF_0_2_5_BITMASK_I_ETH_SMAC          = 0x0000040000000000,
-	BNXT_ULP_HF_0_2_5_BITMASK_I_ETH_TYPE          = 0x0000020000000000,
-	BNXT_ULP_HF_0_2_5_BITMASK_I_IPV4_VER          = 0x0000010000000000,
-	BNXT_ULP_HF_0_2_5_BITMASK_I_IPV4_TOS          = 0x0000008000000000,
-	BNXT_ULP_HF_0_2_5_BITMASK_I_IPV4_LEN          = 0x0000004000000000,
-	BNXT_ULP_HF_0_2_5_BITMASK_I_IPV4_FRAG_ID      = 0x0000002000000000,
-	BNXT_ULP_HF_0_2_5_BITMASK_I_IPV4_FRAG_OFF     = 0x0000001000000000,
-	BNXT_ULP_HF_0_2_5_BITMASK_I_IPV4_TTL          = 0x0000000800000000,
-	BNXT_ULP_HF_0_2_5_BITMASK_I_IPV4_PROTO_ID     = 0x0000000400000000,
-	BNXT_ULP_HF_0_2_5_BITMASK_I_IPV4_CSUM         = 0x0000000200000000,
-	BNXT_ULP_HF_0_2_5_BITMASK_I_IPV4_SRC_ADDR     = 0x0000000100000000,
-	BNXT_ULP_HF_0_2_5_BITMASK_I_IPV4_DST_ADDR     = 0x0000000080000000
+enum bnxt_ulp_hf_0_2_18_bitmask {
+	BNXT_ULP_HF_0_2_18_BITMASK_WM                 = 0x8000000000000000,
+	BNXT_ULP_HF_0_2_18_BITMASK_SVIF_INDEX         = 0x4000000000000000,
+	BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_VER         = 0x2000000000000000,
+	BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_TOS         = 0x1000000000000000,
+	BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_LEN         = 0x0800000000000000,
+	BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_FRAG_ID     = 0x0400000000000000,
+	BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_FRAG_OFF    = 0x0200000000000000,
+	BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_TTL         = 0x0100000000000000,
+	BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_PROTO_ID    = 0x0080000000000000,
+	BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_CSUM        = 0x0040000000000000,
+	BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_SRC_ADDR    = 0x0020000000000000,
+	BNXT_ULP_HF_0_2_18_BITMASK_O_IPV4_DST_ADDR    = 0x0010000000000000,
+	BNXT_ULP_HF_0_2_18_BITMASK_O_UDP_SRC_PORT     = 0x0008000000000000,
+	BNXT_ULP_HF_0_2_18_BITMASK_O_UDP_DST_PORT     = 0x0004000000000000,
+	BNXT_ULP_HF_0_2_18_BITMASK_O_UDP_LENGTH       = 0x0002000000000000,
+	BNXT_ULP_HF_0_2_18_BITMASK_O_UDP_CSUM         = 0x0001000000000000,
+	BNXT_ULP_HF_0_2_18_BITMASK_T_VXLAN_FLAGS      = 0x0000800000000000,
+	BNXT_ULP_HF_0_2_18_BITMASK_T_VXLAN_RSVD0      = 0x0000400000000000,
+	BNXT_ULP_HF_0_2_18_BITMASK_T_VXLAN_VNI        = 0x0000200000000000,
+	BNXT_ULP_HF_0_2_18_BITMASK_T_VXLAN_RSVD1      = 0x0000100000000000,
+	BNXT_ULP_HF_0_2_18_BITMASK_I_ETH_DMAC         = 0x0000080000000000,
+	BNXT_ULP_HF_0_2_18_BITMASK_I_ETH_SMAC         = 0x0000040000000000,
+	BNXT_ULP_HF_0_2_18_BITMASK_I_ETH_TYPE         = 0x0000020000000000,
+	BNXT_ULP_HF_0_2_18_BITMASK_I_IPV4_VER         = 0x0000010000000000,
+	BNXT_ULP_HF_0_2_18_BITMASK_I_IPV4_TOS         = 0x0000008000000000,
+	BNXT_ULP_HF_0_2_18_BITMASK_I_IPV4_LEN         = 0x0000004000000000,
+	BNXT_ULP_HF_0_2_18_BITMASK_I_IPV4_FRAG_ID     = 0x0000002000000000,
+	BNXT_ULP_HF_0_2_18_BITMASK_I_IPV4_FRAG_OFF    = 0x0000001000000000,
+	BNXT_ULP_HF_0_2_18_BITMASK_I_IPV4_TTL         = 0x0000000800000000,
+	BNXT_ULP_HF_0_2_18_BITMASK_I_IPV4_PROTO_ID    = 0x0000000400000000,
+	BNXT_ULP_HF_0_2_18_BITMASK_I_IPV4_CSUM        = 0x0000000200000000,
+	BNXT_ULP_HF_0_2_18_BITMASK_I_IPV4_SRC_ADDR    = 0x0000000100000000,
+	BNXT_ULP_HF_0_2_18_BITMASK_I_IPV4_DST_ADDR    = 0x0000000080000000
 };
 
-enum bnxt_ulp_hf_0_2_6_bitmask {
-	BNXT_ULP_HF_0_2_6_BITMASK_WM                  = 0x8000000000000000,
-	BNXT_ULP_HF_0_2_6_BITMASK_SVIF_INDEX          = 0x4000000000000000,
-	BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_VER          = 0x2000000000000000,
-	BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_TC           = 0x1000000000000000,
-	BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_FLOW_LABEL   = 0x0800000000000000,
-	BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_PAYLOAD_LEN  = 0x0400000000000000,
-	BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_PROTO_ID     = 0x0200000000000000,
-	BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_TTL          = 0x0100000000000000,
-	BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_SRC_ADDR     = 0x0080000000000000,
-	BNXT_ULP_HF_0_2_6_BITMASK_O_IPV6_DST_ADDR     = 0x0040000000000000,
-	BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_SRC_PORT      = 0x0020000000000000,
-	BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_DST_PORT      = 0x0010000000000000,
-	BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_LENGTH        = 0x0008000000000000,
-	BNXT_ULP_HF_0_2_6_BITMASK_O_UDP_CSUM          = 0x0004000000000000,
-	BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_FLAGS       = 0x0002000000000000,
-	BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_RSVD0       = 0x0001000000000000,
-	BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_VNI         = 0x0000800000000000,
-	BNXT_ULP_HF_0_2_6_BITMASK_T_VXLAN_RSVD1       = 0x0000400000000000,
-	BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_DMAC          = 0x0000200000000000,
-	BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_SMAC          = 0x0000100000000000,
-	BNXT_ULP_HF_0_2_6_BITMASK_I_ETH_TYPE          = 0x0000080000000000,
-	BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_VER          = 0x0000040000000000,
-	BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_TC           = 0x0000020000000000,
-	BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_FLOW_LABEL   = 0x0000010000000000,
-	BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_PAYLOAD_LEN  = 0x0000008000000000,
-	BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_PROTO_ID     = 0x0000004000000000,
-	BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_TTL          = 0x0000002000000000,
-	BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_SRC_ADDR     = 0x0000001000000000,
-	BNXT_ULP_HF_0_2_6_BITMASK_I_IPV6_DST_ADDR     = 0x0000000800000000,
-	BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SRC_PORT      = 0x0000000400000000,
-	BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DST_PORT      = 0x0000000200000000,
-	BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_SENT_SEQ      = 0x0000000100000000,
-	BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_RECV_ACK      = 0x0000000080000000,
-	BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_DATA_OFF      = 0x0000000040000000,
-	BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_TCP_FLAGS     = 0x0000000020000000,
-	BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_RX_WIN        = 0x0000000010000000,
-	BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_CSUM          = 0x0000000008000000,
-	BNXT_ULP_HF_0_2_6_BITMASK_I_TCP_URP           = 0x0000000004000000
+enum bnxt_ulp_hf_0_2_19_bitmask {
+	BNXT_ULP_HF_0_2_19_BITMASK_WM                 = 0x8000000000000000,
+	BNXT_ULP_HF_0_2_19_BITMASK_SVIF_INDEX         = 0x4000000000000000,
+	BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_VER         = 0x2000000000000000,
+	BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_TC          = 0x1000000000000000,
+	BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_FLOW_LABEL  = 0x0800000000000000,
+	BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_PAYLOAD_LEN = 0x0400000000000000,
+	BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_PROTO_ID    = 0x0200000000000000,
+	BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_TTL         = 0x0100000000000000,
+	BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_SRC_ADDR    = 0x0080000000000000,
+	BNXT_ULP_HF_0_2_19_BITMASK_O_IPV6_DST_ADDR    = 0x0040000000000000,
+	BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_SRC_PORT     = 0x0020000000000000,
+	BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_DST_PORT     = 0x0010000000000000,
+	BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_LENGTH       = 0x0008000000000000,
+	BNXT_ULP_HF_0_2_19_BITMASK_O_UDP_CSUM         = 0x0004000000000000,
+	BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_FLAGS      = 0x0002000000000000,
+	BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_RSVD0      = 0x0001000000000000,
+	BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_VNI        = 0x0000800000000000,
+	BNXT_ULP_HF_0_2_19_BITMASK_T_VXLAN_RSVD1      = 0x0000400000000000,
+	BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_DMAC         = 0x0000200000000000,
+	BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_SMAC         = 0x0000100000000000,
+	BNXT_ULP_HF_0_2_19_BITMASK_I_ETH_TYPE         = 0x0000080000000000,
+	BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_VER         = 0x0000040000000000,
+	BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_TC          = 0x0000020000000000,
+	BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_FLOW_LABEL  = 0x0000010000000000,
+	BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_PAYLOAD_LEN = 0x0000008000000000,
+	BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_PROTO_ID    = 0x0000004000000000,
+	BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_TTL         = 0x0000002000000000,
+	BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_SRC_ADDR    = 0x0000001000000000,
+	BNXT_ULP_HF_0_2_19_BITMASK_I_IPV6_DST_ADDR    = 0x0000000800000000,
+	BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SRC_PORT     = 0x0000000400000000,
+	BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DST_PORT     = 0x0000000200000000,
+	BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_SENT_SEQ     = 0x0000000100000000,
+	BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_RECV_ACK     = 0x0000000080000000,
+	BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_DATA_OFF     = 0x0000000040000000,
+	BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_TCP_FLAGS    = 0x0000000020000000,
+	BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_RX_WIN       = 0x0000000010000000,
+	BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_CSUM         = 0x0000000008000000,
+	BNXT_ULP_HF_0_2_19_BITMASK_I_TCP_URP          = 0x0000000004000000
 };
 
-enum bnxt_ulp_hf_0_2_7_bitmask {
-	BNXT_ULP_HF_0_2_7_BITMASK_WM                  = 0x8000000000000000,
-	BNXT_ULP_HF_0_2_7_BITMASK_SVIF_INDEX          = 0x4000000000000000,
-	BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_VER          = 0x2000000000000000,
-	BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_TOS          = 0x1000000000000000,
-	BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_LEN          = 0x0800000000000000,
-	BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_FRAG_ID      = 0x0400000000000000,
-	BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_FRAG_OFF     = 0x0200000000000000,
-	BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_TTL          = 0x0100000000000000,
-	BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_PROTO_ID     = 0x0080000000000000,
-	BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_CSUM         = 0x0040000000000000,
-	BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_SRC_ADDR     = 0x0020000000000000,
-	BNXT_ULP_HF_0_2_7_BITMASK_O_IPV4_DST_ADDR     = 0x0010000000000000,
-	BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_SRC_PORT      = 0x0008000000000000,
-	BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_DST_PORT      = 0x0004000000000000,
-	BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_LENGTH        = 0x0002000000000000,
-	BNXT_ULP_HF_0_2_7_BITMASK_O_UDP_CSUM          = 0x0001000000000000,
-	BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_FLAGS       = 0x0000800000000000,
-	BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_RSVD0       = 0x0000400000000000,
-	BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_VNI         = 0x0000200000000000,
-	BNXT_ULP_HF_0_2_7_BITMASK_T_VXLAN_RSVD1       = 0x0000100000000000,
-	BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_DMAC          = 0x0000080000000000,
-	BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_SMAC          = 0x0000040000000000,
-	BNXT_ULP_HF_0_2_7_BITMASK_I_ETH_TYPE          = 0x0000020000000000,
-	BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_VER          = 0x0000010000000000,
-	BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_TC           = 0x0000008000000000,
-	BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_FLOW_LABEL   = 0x0000004000000000,
-	BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_PAYLOAD_LEN  = 0x0000002000000000,
-	BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_PROTO_ID     = 0x0000001000000000,
-	BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_TTL          = 0x0000000800000000,
-	BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_SRC_ADDR     = 0x0000000400000000,
-	BNXT_ULP_HF_0_2_7_BITMASK_I_IPV6_DST_ADDR     = 0x0000000200000000,
-	BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SRC_PORT      = 0x0000000100000000,
-	BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DST_PORT      = 0x0000000080000000,
-	BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_SENT_SEQ      = 0x0000000040000000,
-	BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_RECV_ACK      = 0x0000000020000000,
-	BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_DATA_OFF      = 0x0000000010000000,
-	BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_TCP_FLAGS     = 0x0000000008000000,
-	BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_RX_WIN        = 0x0000000004000000,
-	BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_CSUM          = 0x0000000002000000,
-	BNXT_ULP_HF_0_2_7_BITMASK_I_TCP_URP           = 0x0000000001000000
+enum bnxt_ulp_hf_0_2_20_bitmask {
+	BNXT_ULP_HF_0_2_20_BITMASK_WM                 = 0x8000000000000000,
+	BNXT_ULP_HF_0_2_20_BITMASK_SVIF_INDEX         = 0x4000000000000000,
+	BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_VER         = 0x2000000000000000,
+	BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_TOS         = 0x1000000000000000,
+	BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_LEN         = 0x0800000000000000,
+	BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_FRAG_ID     = 0x0400000000000000,
+	BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_FRAG_OFF    = 0x0200000000000000,
+	BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_TTL         = 0x0100000000000000,
+	BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_PROTO_ID    = 0x0080000000000000,
+	BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_CSUM        = 0x0040000000000000,
+	BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_SRC_ADDR    = 0x0020000000000000,
+	BNXT_ULP_HF_0_2_20_BITMASK_O_IPV4_DST_ADDR    = 0x0010000000000000,
+	BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_SRC_PORT     = 0x0008000000000000,
+	BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_DST_PORT     = 0x0004000000000000,
+	BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_LENGTH       = 0x0002000000000000,
+	BNXT_ULP_HF_0_2_20_BITMASK_O_UDP_CSUM         = 0x0001000000000000,
+	BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_FLAGS      = 0x0000800000000000,
+	BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_RSVD0      = 0x0000400000000000,
+	BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_VNI        = 0x0000200000000000,
+	BNXT_ULP_HF_0_2_20_BITMASK_T_VXLAN_RSVD1      = 0x0000100000000000,
+	BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_DMAC         = 0x0000080000000000,
+	BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_SMAC         = 0x0000040000000000,
+	BNXT_ULP_HF_0_2_20_BITMASK_I_ETH_TYPE         = 0x0000020000000000,
+	BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_VER         = 0x0000010000000000,
+	BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_TC          = 0x0000008000000000,
+	BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_FLOW_LABEL  = 0x0000004000000000,
+	BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_PAYLOAD_LEN = 0x0000002000000000,
+	BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_PROTO_ID    = 0x0000001000000000,
+	BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_TTL         = 0x0000000800000000,
+	BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_SRC_ADDR    = 0x0000000400000000,
+	BNXT_ULP_HF_0_2_20_BITMASK_I_IPV6_DST_ADDR    = 0x0000000200000000,
+	BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SRC_PORT     = 0x0000000100000000,
+	BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DST_PORT     = 0x0000000080000000,
+	BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_SENT_SEQ     = 0x0000000040000000,
+	BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_RECV_ACK     = 0x0000000020000000,
+	BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_DATA_OFF     = 0x0000000010000000,
+	BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_TCP_FLAGS    = 0x0000000008000000,
+	BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_RX_WIN       = 0x0000000004000000,
+	BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_CSUM         = 0x0000000002000000,
+	BNXT_ULP_HF_0_2_20_BITMASK_I_TCP_URP          = 0x0000000001000000
 };
 
-enum bnxt_ulp_hf_0_2_8_bitmask {
-	BNXT_ULP_HF_0_2_8_BITMASK_WM                  = 0x8000000000000000,
-	BNXT_ULP_HF_0_2_8_BITMASK_SVIF_INDEX          = 0x4000000000000000,
-	BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_VER          = 0x2000000000000000,
-	BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_TC           = 0x1000000000000000,
-	BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_FLOW_LABEL   = 0x0800000000000000,
-	BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_PAYLOAD_LEN  = 0x0400000000000000,
-	BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_PROTO_ID     = 0x0200000000000000,
-	BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_TTL          = 0x0100000000000000,
-	BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_SRC_ADDR     = 0x0080000000000000,
-	BNXT_ULP_HF_0_2_8_BITMASK_O_IPV6_DST_ADDR     = 0x0040000000000000,
-	BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_SRC_PORT      = 0x0020000000000000,
-	BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_DST_PORT      = 0x0010000000000000,
-	BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_LENGTH        = 0x0008000000000000,
-	BNXT_ULP_HF_0_2_8_BITMASK_O_UDP_CSUM          = 0x0004000000000000,
-	BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_FLAGS       = 0x0002000000000000,
-	BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_RSVD0       = 0x0001000000000000,
-	BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_VNI         = 0x0000800000000000,
-	BNXT_ULP_HF_0_2_8_BITMASK_T_VXLAN_RSVD1       = 0x0000400000000000,
-	BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_DMAC          = 0x0000200000000000,
-	BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_SMAC          = 0x0000100000000000,
-	BNXT_ULP_HF_0_2_8_BITMASK_I_ETH_TYPE          = 0x0000080000000000,
-	BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_VER          = 0x0000040000000000,
-	BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_TOS          = 0x0000020000000000,
-	BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_LEN          = 0x0000010000000000,
-	BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_FRAG_ID      = 0x0000008000000000,
-	BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_FRAG_OFF     = 0x0000004000000000,
-	BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_TTL          = 0x0000002000000000,
-	BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_PROTO_ID     = 0x0000001000000000,
-	BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_CSUM         = 0x0000000800000000,
-	BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_SRC_ADDR     = 0x0000000400000000,
-	BNXT_ULP_HF_0_2_8_BITMASK_I_IPV4_DST_ADDR     = 0x0000000200000000,
-	BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SRC_PORT      = 0x0000000100000000,
-	BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DST_PORT      = 0x0000000080000000,
-	BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_SENT_SEQ      = 0x0000000040000000,
-	BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_RECV_ACK      = 0x0000000020000000,
-	BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_DATA_OFF      = 0x0000000010000000,
-	BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_TCP_FLAGS     = 0x0000000008000000,
-	BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_RX_WIN        = 0x0000000004000000,
-	BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_CSUM          = 0x0000000002000000,
-	BNXT_ULP_HF_0_2_8_BITMASK_I_TCP_URP           = 0x0000000001000000
+enum bnxt_ulp_hf_0_2_21_bitmask {
+	BNXT_ULP_HF_0_2_21_BITMASK_WM                 = 0x8000000000000000,
+	BNXT_ULP_HF_0_2_21_BITMASK_SVIF_INDEX         = 0x4000000000000000,
+	BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_VER         = 0x2000000000000000,
+	BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_TC          = 0x1000000000000000,
+	BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_FLOW_LABEL  = 0x0800000000000000,
+	BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_PAYLOAD_LEN = 0x0400000000000000,
+	BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_PROTO_ID    = 0x0200000000000000,
+	BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_TTL         = 0x0100000000000000,
+	BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_SRC_ADDR    = 0x0080000000000000,
+	BNXT_ULP_HF_0_2_21_BITMASK_O_IPV6_DST_ADDR    = 0x0040000000000000,
+	BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_SRC_PORT     = 0x0020000000000000,
+	BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_DST_PORT     = 0x0010000000000000,
+	BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_LENGTH       = 0x0008000000000000,
+	BNXT_ULP_HF_0_2_21_BITMASK_O_UDP_CSUM         = 0x0004000000000000,
+	BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_FLAGS      = 0x0002000000000000,
+	BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_RSVD0      = 0x0001000000000000,
+	BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_VNI        = 0x0000800000000000,
+	BNXT_ULP_HF_0_2_21_BITMASK_T_VXLAN_RSVD1      = 0x0000400000000000,
+	BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_DMAC         = 0x0000200000000000,
+	BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_SMAC         = 0x0000100000000000,
+	BNXT_ULP_HF_0_2_21_BITMASK_I_ETH_TYPE         = 0x0000080000000000,
+	BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_VER         = 0x0000040000000000,
+	BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_TOS         = 0x0000020000000000,
+	BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_LEN         = 0x0000010000000000,
+	BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_FRAG_ID     = 0x0000008000000000,
+	BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_FRAG_OFF    = 0x0000004000000000,
+	BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_TTL         = 0x0000002000000000,
+	BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_PROTO_ID    = 0x0000001000000000,
+	BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_CSUM        = 0x0000000800000000,
+	BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_SRC_ADDR    = 0x0000000400000000,
+	BNXT_ULP_HF_0_2_21_BITMASK_I_IPV4_DST_ADDR    = 0x0000000200000000,
+	BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SRC_PORT     = 0x0000000100000000,
+	BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DST_PORT     = 0x0000000080000000,
+	BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_SENT_SEQ     = 0x0000000040000000,
+	BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_RECV_ACK     = 0x0000000020000000,
+	BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_DATA_OFF     = 0x0000000010000000,
+	BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_TCP_FLAGS    = 0x0000000008000000,
+	BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_RX_WIN       = 0x0000000004000000,
+	BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_CSUM         = 0x0000000002000000,
+	BNXT_ULP_HF_0_2_21_BITMASK_I_TCP_URP          = 0x0000000001000000
 };
 
-enum bnxt_ulp_hf_0_2_9_bitmask {
-	BNXT_ULP_HF_0_2_9_BITMASK_WM                  = 0x8000000000000000,
-	BNXT_ULP_HF_0_2_9_BITMASK_SVIF_INDEX          = 0x4000000000000000,
-	BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_VER          = 0x2000000000000000,
-	BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_TOS          = 0x1000000000000000,
-	BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_LEN          = 0x0800000000000000,
-	BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_FRAG_ID      = 0x0400000000000000,
-	BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_FRAG_OFF     = 0x0200000000000000,
-	BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_TTL          = 0x0100000000000000,
-	BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_PROTO_ID     = 0x0080000000000000,
-	BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_CSUM         = 0x0040000000000000,
-	BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_SRC_ADDR     = 0x0020000000000000,
-	BNXT_ULP_HF_0_2_9_BITMASK_O_IPV4_DST_ADDR     = 0x0010000000000000,
-	BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_SRC_PORT      = 0x0008000000000000,
-	BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_DST_PORT      = 0x0004000000000000,
-	BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_LENGTH        = 0x0002000000000000,
-	BNXT_ULP_HF_0_2_9_BITMASK_O_UDP_CSUM          = 0x0001000000000000,
-	BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_FLAGS       = 0x0000800000000000,
-	BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_RSVD0       = 0x0000400000000000,
-	BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_VNI         = 0x0000200000000000,
-	BNXT_ULP_HF_0_2_9_BITMASK_T_VXLAN_RSVD1       = 0x0000100000000000,
-	BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_DMAC          = 0x0000080000000000,
-	BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_SMAC          = 0x0000040000000000,
-	BNXT_ULP_HF_0_2_9_BITMASK_I_ETH_TYPE          = 0x0000020000000000,
-	BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_VER          = 0x0000010000000000,
-	BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_TOS          = 0x0000008000000000,
-	BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_LEN          = 0x0000004000000000,
-	BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_FRAG_ID      = 0x0000002000000000,
-	BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_FRAG_OFF     = 0x0000001000000000,
-	BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_TTL          = 0x0000000800000000,
-	BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_PROTO_ID     = 0x0000000400000000,
-	BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_CSUM         = 0x0000000200000000,
-	BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_SRC_ADDR     = 0x0000000100000000,
-	BNXT_ULP_HF_0_2_9_BITMASK_I_IPV4_DST_ADDR     = 0x0000000080000000,
-	BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SRC_PORT      = 0x0000000040000000,
-	BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DST_PORT      = 0x0000000020000000,
-	BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_SENT_SEQ      = 0x0000000010000000,
-	BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_RECV_ACK      = 0x0000000008000000,
-	BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_DATA_OFF      = 0x0000000004000000,
-	BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_TCP_FLAGS     = 0x0000000002000000,
-	BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_RX_WIN        = 0x0000000001000000,
-	BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_CSUM          = 0x0000000000800000,
-	BNXT_ULP_HF_0_2_9_BITMASK_I_TCP_URP           = 0x0000000000400000
+enum bnxt_ulp_hf_0_2_22_bitmask {
+	BNXT_ULP_HF_0_2_22_BITMASK_WM                 = 0x8000000000000000,
+	BNXT_ULP_HF_0_2_22_BITMASK_SVIF_INDEX         = 0x4000000000000000,
+	BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_VER         = 0x2000000000000000,
+	BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_TOS         = 0x1000000000000000,
+	BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_LEN         = 0x0800000000000000,
+	BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_FRAG_ID     = 0x0400000000000000,
+	BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_FRAG_OFF    = 0x0200000000000000,
+	BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_TTL         = 0x0100000000000000,
+	BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_PROTO_ID    = 0x0080000000000000,
+	BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_CSUM        = 0x0040000000000000,
+	BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_SRC_ADDR    = 0x0020000000000000,
+	BNXT_ULP_HF_0_2_22_BITMASK_O_IPV4_DST_ADDR    = 0x0010000000000000,
+	BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_SRC_PORT     = 0x0008000000000000,
+	BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_DST_PORT     = 0x0004000000000000,
+	BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_LENGTH       = 0x0002000000000000,
+	BNXT_ULP_HF_0_2_22_BITMASK_O_UDP_CSUM         = 0x0001000000000000,
+	BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_FLAGS      = 0x0000800000000000,
+	BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_RSVD0      = 0x0000400000000000,
+	BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_VNI        = 0x0000200000000000,
+	BNXT_ULP_HF_0_2_22_BITMASK_T_VXLAN_RSVD1      = 0x0000100000000000,
+	BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_DMAC         = 0x0000080000000000,
+	BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_SMAC         = 0x0000040000000000,
+	BNXT_ULP_HF_0_2_22_BITMASK_I_ETH_TYPE         = 0x0000020000000000,
+	BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_VER         = 0x0000010000000000,
+	BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_TOS         = 0x0000008000000000,
+	BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_LEN         = 0x0000004000000000,
+	BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_FRAG_ID     = 0x0000002000000000,
+	BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_FRAG_OFF    = 0x0000001000000000,
+	BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_TTL         = 0x0000000800000000,
+	BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_PROTO_ID    = 0x0000000400000000,
+	BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_CSUM        = 0x0000000200000000,
+	BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_SRC_ADDR    = 0x0000000100000000,
+	BNXT_ULP_HF_0_2_22_BITMASK_I_IPV4_DST_ADDR    = 0x0000000080000000,
+	BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SRC_PORT     = 0x0000000040000000,
+	BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DST_PORT     = 0x0000000020000000,
+	BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_SENT_SEQ     = 0x0000000010000000,
+	BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_RECV_ACK     = 0x0000000008000000,
+	BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_DATA_OFF     = 0x0000000004000000,
+	BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_TCP_FLAGS    = 0x0000000002000000,
+	BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_RX_WIN       = 0x0000000001000000,
+	BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_CSUM         = 0x0000000000800000,
+	BNXT_ULP_HF_0_2_22_BITMASK_I_TCP_URP          = 0x0000000000400000
 };
 
-enum bnxt_ulp_hf_0_2_10_bitmask {
-	BNXT_ULP_HF_0_2_10_BITMASK_WM                 = 0x8000000000000000,
-	BNXT_ULP_HF_0_2_10_BITMASK_SVIF_INDEX         = 0x4000000000000000,
-	BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_VER         = 0x2000000000000000,
-	BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_TC          = 0x1000000000000000,
-	BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_FLOW_LABEL  = 0x0800000000000000,
-	BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_PAYLOAD_LEN = 0x0400000000000000,
-	BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_PROTO_ID    = 0x0200000000000000,
-	BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_TTL         = 0x0100000000000000,
-	BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_SRC_ADDR    = 0x0080000000000000,
-	BNXT_ULP_HF_0_2_10_BITMASK_O_IPV6_DST_ADDR    = 0x0040000000000000,
-	BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_SRC_PORT     = 0x0020000000000000,
-	BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_DST_PORT     = 0x0010000000000000,
-	BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_LENGTH       = 0x0008000000000000,
-	BNXT_ULP_HF_0_2_10_BITMASK_O_UDP_CSUM         = 0x0004000000000000,
-	BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_FLAGS      = 0x0002000000000000,
-	BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_RSVD0      = 0x0001000000000000,
-	BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_VNI        = 0x0000800000000000,
-	BNXT_ULP_HF_0_2_10_BITMASK_T_VXLAN_RSVD1      = 0x0000400000000000,
-	BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_DMAC         = 0x0000200000000000,
-	BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_SMAC         = 0x0000100000000000,
-	BNXT_ULP_HF_0_2_10_BITMASK_I_ETH_TYPE         = 0x0000080000000000,
-	BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_VER         = 0x0000040000000000,
-	BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_TC          = 0x0000020000000000,
-	BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_FLOW_LABEL  = 0x0000010000000000,
-	BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_PAYLOAD_LEN = 0x0000008000000000,
-	BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_PROTO_ID    = 0x0000004000000000,
-	BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_TTL         = 0x0000002000000000,
-	BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_SRC_ADDR    = 0x0000001000000000,
-	BNXT_ULP_HF_0_2_10_BITMASK_I_IPV6_DST_ADDR    = 0x0000000800000000,
-	BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_SRC_PORT     = 0x0000000400000000,
-	BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_DST_PORT     = 0x0000000200000000,
-	BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_LENGTH       = 0x0000000100000000,
-	BNXT_ULP_HF_0_2_10_BITMASK_I_UDP_CSUM         = 0x0000000080000000
+enum bnxt_ulp_hf_0_2_23_bitmask {
+	BNXT_ULP_HF_0_2_23_BITMASK_WM                 = 0x8000000000000000,
+	BNXT_ULP_HF_0_2_23_BITMASK_SVIF_INDEX         = 0x4000000000000000,
+	BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_VER         = 0x2000000000000000,
+	BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_TC          = 0x1000000000000000,
+	BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_FLOW_LABEL  = 0x0800000000000000,
+	BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_PAYLOAD_LEN = 0x0400000000000000,
+	BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_PROTO_ID    = 0x0200000000000000,
+	BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_TTL         = 0x0100000000000000,
+	BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_SRC_ADDR    = 0x0080000000000000,
+	BNXT_ULP_HF_0_2_23_BITMASK_O_IPV6_DST_ADDR    = 0x0040000000000000,
+	BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_SRC_PORT     = 0x0020000000000000,
+	BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_DST_PORT     = 0x0010000000000000,
+	BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_LENGTH       = 0x0008000000000000,
+	BNXT_ULP_HF_0_2_23_BITMASK_O_UDP_CSUM         = 0x0004000000000000,
+	BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_FLAGS      = 0x0002000000000000,
+	BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_RSVD0      = 0x0001000000000000,
+	BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_VNI        = 0x0000800000000000,
+	BNXT_ULP_HF_0_2_23_BITMASK_T_VXLAN_RSVD1      = 0x0000400000000000,
+	BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_DMAC         = 0x0000200000000000,
+	BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_SMAC         = 0x0000100000000000,
+	BNXT_ULP_HF_0_2_23_BITMASK_I_ETH_TYPE         = 0x0000080000000000,
+	BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_VER         = 0x0000040000000000,
+	BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_TC          = 0x0000020000000000,
+	BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_FLOW_LABEL  = 0x0000010000000000,
+	BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_PAYLOAD_LEN = 0x0000008000000000,
+	BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_PROTO_ID    = 0x0000004000000000,
+	BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_TTL         = 0x0000002000000000,
+	BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_SRC_ADDR    = 0x0000001000000000,
+	BNXT_ULP_HF_0_2_23_BITMASK_I_IPV6_DST_ADDR    = 0x0000000800000000,
+	BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_SRC_PORT     = 0x0000000400000000,
+	BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_DST_PORT     = 0x0000000200000000,
+	BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_LENGTH       = 0x0000000100000000,
+	BNXT_ULP_HF_0_2_23_BITMASK_I_UDP_CSUM         = 0x0000000080000000
 };
 
-enum bnxt_ulp_hf_0_2_11_bitmask {
-	BNXT_ULP_HF_0_2_11_BITMASK_WM                 = 0x8000000000000000,
-	BNXT_ULP_HF_0_2_11_BITMASK_SVIF_INDEX         = 0x4000000000000000,
-	BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_VER         = 0x2000000000000000,
-	BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_TOS         = 0x1000000000000000,
-	BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_LEN         = 0x0800000000000000,
-	BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_FRAG_ID     = 0x0400000000000000,
-	BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_FRAG_OFF    = 0x0200000000000000,
-	BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_TTL         = 0x0100000000000000,
-	BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_PROTO_ID    = 0x0080000000000000,
-	BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_CSUM        = 0x0040000000000000,
-	BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_SRC_ADDR    = 0x0020000000000000,
-	BNXT_ULP_HF_0_2_11_BITMASK_O_IPV4_DST_ADDR    = 0x0010000000000000,
-	BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_SRC_PORT     = 0x0008000000000000,
-	BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_DST_PORT     = 0x0004000000000000,
-	BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_LENGTH       = 0x0002000000000000,
-	BNXT_ULP_HF_0_2_11_BITMASK_O_UDP_CSUM         = 0x0001000000000000,
-	BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_FLAGS      = 0x0000800000000000,
-	BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_RSVD0      = 0x0000400000000000,
-	BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_VNI        = 0x0000200000000000,
-	BNXT_ULP_HF_0_2_11_BITMASK_T_VXLAN_RSVD1      = 0x0000100000000000,
-	BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_DMAC         = 0x0000080000000000,
-	BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_SMAC         = 0x0000040000000000,
-	BNXT_ULP_HF_0_2_11_BITMASK_I_ETH_TYPE         = 0x0000020000000000,
-	BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_VER         = 0x0000010000000000,
-	BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_TC          = 0x0000008000000000,
-	BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_FLOW_LABEL  = 0x0000004000000000,
-	BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_PAYLOAD_LEN = 0x0000002000000000,
-	BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_PROTO_ID    = 0x0000001000000000,
-	BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_TTL         = 0x0000000800000000,
-	BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_SRC_ADDR    = 0x0000000400000000,
-	BNXT_ULP_HF_0_2_11_BITMASK_I_IPV6_DST_ADDR    = 0x0000000200000000,
-	BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_SRC_PORT     = 0x0000000100000000,
-	BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_DST_PORT     = 0x0000000080000000,
-	BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_LENGTH       = 0x0000000040000000,
-	BNXT_ULP_HF_0_2_11_BITMASK_I_UDP_CSUM         = 0x0000000020000000
+enum bnxt_ulp_hf_0_2_24_bitmask {
+	BNXT_ULP_HF_0_2_24_BITMASK_WM                 = 0x8000000000000000,
+	BNXT_ULP_HF_0_2_24_BITMASK_SVIF_INDEX         = 0x4000000000000000,
+	BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_VER         = 0x2000000000000000,
+	BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_TOS         = 0x1000000000000000,
+	BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_LEN         = 0x0800000000000000,
+	BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_FRAG_ID     = 0x0400000000000000,
+	BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_FRAG_OFF    = 0x0200000000000000,
+	BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_TTL         = 0x0100000000000000,
+	BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_PROTO_ID    = 0x0080000000000000,
+	BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_CSUM        = 0x0040000000000000,
+	BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_SRC_ADDR    = 0x0020000000000000,
+	BNXT_ULP_HF_0_2_24_BITMASK_O_IPV4_DST_ADDR    = 0x0010000000000000,
+	BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_SRC_PORT     = 0x0008000000000000,
+	BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_DST_PORT     = 0x0004000000000000,
+	BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_LENGTH       = 0x0002000000000000,
+	BNXT_ULP_HF_0_2_24_BITMASK_O_UDP_CSUM         = 0x0001000000000000,
+	BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_FLAGS      = 0x0000800000000000,
+	BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_RSVD0      = 0x0000400000000000,
+	BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_VNI        = 0x0000200000000000,
+	BNXT_ULP_HF_0_2_24_BITMASK_T_VXLAN_RSVD1      = 0x0000100000000000,
+	BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_DMAC         = 0x0000080000000000,
+	BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_SMAC         = 0x0000040000000000,
+	BNXT_ULP_HF_0_2_24_BITMASK_I_ETH_TYPE         = 0x0000020000000000,
+	BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_VER         = 0x0000010000000000,
+	BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_TC          = 0x0000008000000000,
+	BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_FLOW_LABEL  = 0x0000004000000000,
+	BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_PAYLOAD_LEN = 0x0000002000000000,
+	BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_PROTO_ID    = 0x0000001000000000,
+	BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_TTL         = 0x0000000800000000,
+	BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_SRC_ADDR    = 0x0000000400000000,
+	BNXT_ULP_HF_0_2_24_BITMASK_I_IPV6_DST_ADDR    = 0x0000000200000000,
+	BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_SRC_PORT     = 0x0000000100000000,
+	BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_DST_PORT     = 0x0000000080000000,
+	BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_LENGTH       = 0x0000000040000000,
+	BNXT_ULP_HF_0_2_24_BITMASK_I_UDP_CSUM         = 0x0000000020000000
 };
 
-enum bnxt_ulp_hf_0_2_12_bitmask {
-	BNXT_ULP_HF_0_2_12_BITMASK_WM                 = 0x8000000000000000,
-	BNXT_ULP_HF_0_2_12_BITMASK_SVIF_INDEX         = 0x4000000000000000,
-	BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_VER         = 0x2000000000000000,
-	BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_TC          = 0x1000000000000000,
-	BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_FLOW_LABEL  = 0x0800000000000000,
-	BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_PAYLOAD_LEN = 0x0400000000000000,
-	BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_PROTO_ID    = 0x0200000000000000,
-	BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_TTL         = 0x0100000000000000,
-	BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_SRC_ADDR    = 0x0080000000000000,
-	BNXT_ULP_HF_0_2_12_BITMASK_O_IPV6_DST_ADDR    = 0x0040000000000000,
-	BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_SRC_PORT     = 0x0020000000000000,
-	BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_DST_PORT     = 0x0010000000000000,
-	BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_LENGTH       = 0x0008000000000000,
-	BNXT_ULP_HF_0_2_12_BITMASK_O_UDP_CSUM         = 0x0004000000000000,
-	BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_FLAGS      = 0x0002000000000000,
-	BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_RSVD0      = 0x0001000000000000,
-	BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_VNI        = 0x0000800000000000,
-	BNXT_ULP_HF_0_2_12_BITMASK_T_VXLAN_RSVD1      = 0x0000400000000000,
-	BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_DMAC         = 0x0000200000000000,
-	BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_SMAC         = 0x0000100000000000,
-	BNXT_ULP_HF_0_2_12_BITMASK_I_ETH_TYPE         = 0x0000080000000000,
-	BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_VER         = 0x0000040000000000,
-	BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_TOS         = 0x0000020000000000,
-	BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_LEN         = 0x0000010000000000,
-	BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_FRAG_ID     = 0x0000008000000000,
-	BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_FRAG_OFF    = 0x0000004000000000,
-	BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_TTL         = 0x0000002000000000,
-	BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_PROTO_ID    = 0x0000001000000000,
-	BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_CSUM        = 0x0000000800000000,
-	BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_SRC_ADDR    = 0x0000000400000000,
-	BNXT_ULP_HF_0_2_12_BITMASK_I_IPV4_DST_ADDR    = 0x0000000200000000,
-	BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_SRC_PORT     = 0x0000000100000000,
-	BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_DST_PORT     = 0x0000000080000000,
-	BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_LENGTH       = 0x0000000040000000,
-	BNXT_ULP_HF_0_2_12_BITMASK_I_UDP_CSUM         = 0x0000000020000000
+enum bnxt_ulp_hf_0_2_25_bitmask {
+	BNXT_ULP_HF_0_2_25_BITMASK_WM                 = 0x8000000000000000,
+	BNXT_ULP_HF_0_2_25_BITMASK_SVIF_INDEX         = 0x4000000000000000,
+	BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_VER         = 0x2000000000000000,
+	BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_TC          = 0x1000000000000000,
+	BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_FLOW_LABEL  = 0x0800000000000000,
+	BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_PAYLOAD_LEN = 0x0400000000000000,
+	BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_PROTO_ID    = 0x0200000000000000,
+	BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_TTL         = 0x0100000000000000,
+	BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_SRC_ADDR    = 0x0080000000000000,
+	BNXT_ULP_HF_0_2_25_BITMASK_O_IPV6_DST_ADDR    = 0x0040000000000000,
+	BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_SRC_PORT     = 0x0020000000000000,
+	BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_DST_PORT     = 0x0010000000000000,
+	BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_LENGTH       = 0x0008000000000000,
+	BNXT_ULP_HF_0_2_25_BITMASK_O_UDP_CSUM         = 0x0004000000000000,
+	BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_FLAGS      = 0x0002000000000000,
+	BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_RSVD0      = 0x0001000000000000,
+	BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_VNI        = 0x0000800000000000,
+	BNXT_ULP_HF_0_2_25_BITMASK_T_VXLAN_RSVD1      = 0x0000400000000000,
+	BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_DMAC         = 0x0000200000000000,
+	BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_SMAC         = 0x0000100000000000,
+	BNXT_ULP_HF_0_2_25_BITMASK_I_ETH_TYPE         = 0x0000080000000000,
+	BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_VER         = 0x0000040000000000,
+	BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_TOS         = 0x0000020000000000,
+	BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_LEN         = 0x0000010000000000,
+	BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_FRAG_ID     = 0x0000008000000000,
+	BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_FRAG_OFF    = 0x0000004000000000,
+	BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_TTL         = 0x0000002000000000,
+	BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_PROTO_ID    = 0x0000001000000000,
+	BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_CSUM        = 0x0000000800000000,
+	BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_SRC_ADDR    = 0x0000000400000000,
+	BNXT_ULP_HF_0_2_25_BITMASK_I_IPV4_DST_ADDR    = 0x0000000200000000,
+	BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_SRC_PORT     = 0x0000000100000000,
+	BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_DST_PORT     = 0x0000000080000000,
+	BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_LENGTH       = 0x0000000040000000,
+	BNXT_ULP_HF_0_2_25_BITMASK_I_UDP_CSUM         = 0x0000000020000000
 };
 
-enum bnxt_ulp_hf_0_2_13_bitmask {
-	BNXT_ULP_HF_0_2_13_BITMASK_WM                 = 0x8000000000000000,
-	BNXT_ULP_HF_0_2_13_BITMASK_SVIF_INDEX         = 0x4000000000000000,
-	BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_VER         = 0x2000000000000000,
-	BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_TOS         = 0x1000000000000000,
-	BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_LEN         = 0x0800000000000000,
-	BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_FRAG_ID     = 0x0400000000000000,
-	BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_FRAG_OFF    = 0x0200000000000000,
-	BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_TTL         = 0x0100000000000000,
-	BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_PROTO_ID    = 0x0080000000000000,
-	BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_CSUM        = 0x0040000000000000,
-	BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_SRC_ADDR    = 0x0020000000000000,
-	BNXT_ULP_HF_0_2_13_BITMASK_O_IPV4_DST_ADDR    = 0x0010000000000000,
-	BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_SRC_PORT     = 0x0008000000000000,
-	BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_DST_PORT     = 0x0004000000000000,
-	BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_LENGTH       = 0x0002000000000000,
-	BNXT_ULP_HF_0_2_13_BITMASK_O_UDP_CSUM         = 0x0001000000000000,
-	BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_FLAGS      = 0x0000800000000000,
-	BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_RSVD0      = 0x0000400000000000,
-	BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_VNI        = 0x0000200000000000,
-	BNXT_ULP_HF_0_2_13_BITMASK_T_VXLAN_RSVD1      = 0x0000100000000000,
-	BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_DMAC         = 0x0000080000000000,
-	BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_SMAC         = 0x0000040000000000,
-	BNXT_ULP_HF_0_2_13_BITMASK_I_ETH_TYPE         = 0x0000020000000000,
-	BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_VER         = 0x0000010000000000,
-	BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_TOS         = 0x0000008000000000,
-	BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_LEN         = 0x0000004000000000,
-	BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_FRAG_ID     = 0x0000002000000000,
-	BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_FRAG_OFF    = 0x0000001000000000,
-	BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_TTL         = 0x0000000800000000,
-	BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_PROTO_ID    = 0x0000000400000000,
-	BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_CSUM        = 0x0000000200000000,
-	BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_SRC_ADDR    = 0x0000000100000000,
-	BNXT_ULP_HF_0_2_13_BITMASK_I_IPV4_DST_ADDR    = 0x0000000080000000,
-	BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_SRC_PORT     = 0x0000000040000000,
-	BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_DST_PORT     = 0x0000000020000000,
-	BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_LENGTH       = 0x0000000010000000,
-	BNXT_ULP_HF_0_2_13_BITMASK_I_UDP_CSUM         = 0x0000000008000000
+enum bnxt_ulp_hf_0_2_26_bitmask {
+	BNXT_ULP_HF_0_2_26_BITMASK_WM                 = 0x8000000000000000,
+	BNXT_ULP_HF_0_2_26_BITMASK_SVIF_INDEX         = 0x4000000000000000,
+	BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_VER         = 0x2000000000000000,
+	BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_TOS         = 0x1000000000000000,
+	BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_LEN         = 0x0800000000000000,
+	BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_FRAG_ID     = 0x0400000000000000,
+	BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_FRAG_OFF    = 0x0200000000000000,
+	BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_TTL         = 0x0100000000000000,
+	BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_PROTO_ID    = 0x0080000000000000,
+	BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_CSUM        = 0x0040000000000000,
+	BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_SRC_ADDR    = 0x0020000000000000,
+	BNXT_ULP_HF_0_2_26_BITMASK_O_IPV4_DST_ADDR    = 0x0010000000000000,
+	BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_SRC_PORT     = 0x0008000000000000,
+	BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_DST_PORT     = 0x0004000000000000,
+	BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_LENGTH       = 0x0002000000000000,
+	BNXT_ULP_HF_0_2_26_BITMASK_O_UDP_CSUM         = 0x0001000000000000,
+	BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_FLAGS      = 0x0000800000000000,
+	BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_RSVD0      = 0x0000400000000000,
+	BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_VNI        = 0x0000200000000000,
+	BNXT_ULP_HF_0_2_26_BITMASK_T_VXLAN_RSVD1      = 0x0000100000000000,
+	BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_DMAC         = 0x0000080000000000,
+	BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_SMAC         = 0x0000040000000000,
+	BNXT_ULP_HF_0_2_26_BITMASK_I_ETH_TYPE         = 0x0000020000000000,
+	BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_VER         = 0x0000010000000000,
+	BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_TOS         = 0x0000008000000000,
+	BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_LEN         = 0x0000004000000000,
+	BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_FRAG_ID     = 0x0000002000000000,
+	BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_FRAG_OFF    = 0x0000001000000000,
+	BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_TTL         = 0x0000000800000000,
+	BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_PROTO_ID    = 0x0000000400000000,
+	BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_CSUM        = 0x0000000200000000,
+	BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_SRC_ADDR    = 0x0000000100000000,
+	BNXT_ULP_HF_0_2_26_BITMASK_I_IPV4_DST_ADDR    = 0x0000000080000000,
+	BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_SRC_PORT     = 0x0000000040000000,
+	BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_DST_PORT     = 0x0000000020000000,
+	BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_LENGTH       = 0x0000000010000000,
+	BNXT_ULP_HF_0_2_26_BITMASK_I_UDP_CSUM         = 0x0000000008000000
 };
 
-enum bnxt_ulp_hf_0_2_14_bitmask {
-	BNXT_ULP_HF_0_2_14_BITMASK_WM                 = 0x8000000000000000,
-	BNXT_ULP_HF_0_2_14_BITMASK_SVIF_INDEX         = 0x4000000000000000,
-	BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_VER         = 0x2000000000000000,
-	BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_TC          = 0x1000000000000000,
-	BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_FLOW_LABEL  = 0x0800000000000000,
-	BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_PAYLOAD_LEN = 0x0400000000000000,
-	BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_PROTO_ID    = 0x0200000000000000,
-	BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_TTL         = 0x0100000000000000,
-	BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_SRC_ADDR    = 0x0080000000000000,
-	BNXT_ULP_HF_0_2_14_BITMASK_O_IPV6_DST_ADDR    = 0x0040000000000000,
-	BNXT_ULP_HF_0_2_14_BITMASK_O_UDP_SRC_PORT     = 0x0020000000000000,
-	BNXT_ULP_HF_0_2_14_BITMASK_O_UDP_DST_PORT     = 0x0010000000000000,
-	BNXT_ULP_HF_0_2_14_BITMASK_O_UDP_LENGTH       = 0x0008000000000000,
-	BNXT_ULP_HF_0_2_14_BITMASK_O_UDP_CSUM         = 0x0004000000000000,
-	BNXT_ULP_HF_0_2_14_BITMASK_T_VXLAN_FLAGS      = 0x0002000000000000,
-	BNXT_ULP_HF_0_2_14_BITMASK_T_VXLAN_RSVD0      = 0x0001000000000000,
-	BNXT_ULP_HF_0_2_14_BITMASK_T_VXLAN_VNI        = 0x0000800000000000,
-	BNXT_ULP_HF_0_2_14_BITMASK_T_VXLAN_RSVD1      = 0x0000400000000000,
-	BNXT_ULP_HF_0_2_14_BITMASK_I_ETH_DMAC         = 0x0000200000000000,
-	BNXT_ULP_HF_0_2_14_BITMASK_I_ETH_SMAC         = 0x0000100000000000,
-	BNXT_ULP_HF_0_2_14_BITMASK_I_ETH_TYPE         = 0x0000080000000000,
-	BNXT_ULP_HF_0_2_14_BITMASK_I_IPV4_VER         = 0x0000040000000000,
-	BNXT_ULP_HF_0_2_14_BITMASK_I_IPV4_TOS         = 0x0000020000000000,
-	BNXT_ULP_HF_0_2_14_BITMASK_I_IPV4_LEN         = 0x0000010000000000,
-	BNXT_ULP_HF_0_2_14_BITMASK_I_IPV4_FRAG_ID     = 0x0000008000000000,
-	BNXT_ULP_HF_0_2_14_BITMASK_I_IPV4_FRAG_OFF    = 0x0000004000000000,
-	BNXT_ULP_HF_0_2_14_BITMASK_I_IPV4_TTL         = 0x0000002000000000,
-	BNXT_ULP_HF_0_2_14_BITMASK_I_IPV4_PROTO_ID    = 0x0000001000000000,
-	BNXT_ULP_HF_0_2_14_BITMASK_I_IPV4_CSUM        = 0x0000000800000000,
-	BNXT_ULP_HF_0_2_14_BITMASK_I_IPV4_SRC_ADDR    = 0x0000000400000000,
-	BNXT_ULP_HF_0_2_14_BITMASK_I_IPV4_DST_ADDR    = 0x0000000200000000,
-	BNXT_ULP_HF_0_2_14_BITMASK_I_ICMP_TYPE        = 0x0000000100000000,
-	BNXT_ULP_HF_0_2_14_BITMASK_I_ICMP_CODE        = 0x0000000080000000,
-	BNXT_ULP_HF_0_2_14_BITMASK_I_ICMP_CSUM        = 0x0000000040000000,
-	BNXT_ULP_HF_0_2_14_BITMASK_I_ICMP_IDENT       = 0x0000000020000000,
-	BNXT_ULP_HF_0_2_14_BITMASK_I_ICMP_SEQ_NUM     = 0x0000000010000000
+enum bnxt_ulp_hf_0_2_27_bitmask {
+	BNXT_ULP_HF_0_2_27_BITMASK_WM                 = 0x8000000000000000,
+	BNXT_ULP_HF_0_2_27_BITMASK_SVIF_INDEX         = 0x4000000000000000,
+	BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_VER         = 0x2000000000000000,
+	BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_TC          = 0x1000000000000000,
+	BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_FLOW_LABEL  = 0x0800000000000000,
+	BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_PAYLOAD_LEN = 0x0400000000000000,
+	BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_PROTO_ID    = 0x0200000000000000,
+	BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_TTL         = 0x0100000000000000,
+	BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_SRC_ADDR    = 0x0080000000000000,
+	BNXT_ULP_HF_0_2_27_BITMASK_O_IPV6_DST_ADDR    = 0x0040000000000000,
+	BNXT_ULP_HF_0_2_27_BITMASK_O_UDP_SRC_PORT     = 0x0020000000000000,
+	BNXT_ULP_HF_0_2_27_BITMASK_O_UDP_DST_PORT     = 0x0010000000000000,
+	BNXT_ULP_HF_0_2_27_BITMASK_O_UDP_LENGTH       = 0x0008000000000000,
+	BNXT_ULP_HF_0_2_27_BITMASK_O_UDP_CSUM         = 0x0004000000000000,
+	BNXT_ULP_HF_0_2_27_BITMASK_T_VXLAN_FLAGS      = 0x0002000000000000,
+	BNXT_ULP_HF_0_2_27_BITMASK_T_VXLAN_RSVD0      = 0x0001000000000000,
+	BNXT_ULP_HF_0_2_27_BITMASK_T_VXLAN_VNI        = 0x0000800000000000,
+	BNXT_ULP_HF_0_2_27_BITMASK_T_VXLAN_RSVD1      = 0x0000400000000000,
+	BNXT_ULP_HF_0_2_27_BITMASK_I_ETH_DMAC         = 0x0000200000000000,
+	BNXT_ULP_HF_0_2_27_BITMASK_I_ETH_SMAC         = 0x0000100000000000,
+	BNXT_ULP_HF_0_2_27_BITMASK_I_ETH_TYPE         = 0x0000080000000000,
+	BNXT_ULP_HF_0_2_27_BITMASK_I_IPV4_VER         = 0x0000040000000000,
+	BNXT_ULP_HF_0_2_27_BITMASK_I_IPV4_TOS         = 0x0000020000000000,
+	BNXT_ULP_HF_0_2_27_BITMASK_I_IPV4_LEN         = 0x0000010000000000,
+	BNXT_ULP_HF_0_2_27_BITMASK_I_IPV4_FRAG_ID     = 0x0000008000000000,
+	BNXT_ULP_HF_0_2_27_BITMASK_I_IPV4_FRAG_OFF    = 0x0000004000000000,
+	BNXT_ULP_HF_0_2_27_BITMASK_I_IPV4_TTL         = 0x0000002000000000,
+	BNXT_ULP_HF_0_2_27_BITMASK_I_IPV4_PROTO_ID    = 0x0000001000000000,
+	BNXT_ULP_HF_0_2_27_BITMASK_I_IPV4_CSUM        = 0x0000000800000000,
+	BNXT_ULP_HF_0_2_27_BITMASK_I_IPV4_SRC_ADDR    = 0x0000000400000000,
+	BNXT_ULP_HF_0_2_27_BITMASK_I_IPV4_DST_ADDR    = 0x0000000200000000,
+	BNXT_ULP_HF_0_2_27_BITMASK_I_ICMP_TYPE        = 0x0000000100000000,
+	BNXT_ULP_HF_0_2_27_BITMASK_I_ICMP_CODE        = 0x0000000080000000,
+	BNXT_ULP_HF_0_2_27_BITMASK_I_ICMP_CSUM        = 0x0000000040000000,
+	BNXT_ULP_HF_0_2_27_BITMASK_I_ICMP_IDENT       = 0x0000000020000000,
+	BNXT_ULP_HF_0_2_27_BITMASK_I_ICMP_SEQ_NUM     = 0x0000000010000000
 };
 
-enum bnxt_ulp_hf_0_2_15_bitmask {
-	BNXT_ULP_HF_0_2_15_BITMASK_WM                 = 0x8000000000000000,
-	BNXT_ULP_HF_0_2_15_BITMASK_SVIF_INDEX         = 0x4000000000000000,
-	BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_VER         = 0x2000000000000000,
-	BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_TOS         = 0x1000000000000000,
-	BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_LEN         = 0x0800000000000000,
-	BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_FRAG_ID     = 0x0400000000000000,
-	BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_FRAG_OFF    = 0x0200000000000000,
-	BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_TTL         = 0x0100000000000000,
-	BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_PROTO_ID    = 0x0080000000000000,
-	BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_CSUM        = 0x0040000000000000,
-	BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_SRC_ADDR    = 0x0020000000000000,
-	BNXT_ULP_HF_0_2_15_BITMASK_O_IPV4_DST_ADDR    = 0x0010000000000000,
-	BNXT_ULP_HF_0_2_15_BITMASK_O_UDP_SRC_PORT     = 0x0008000000000000,
-	BNXT_ULP_HF_0_2_15_BITMASK_O_UDP_DST_PORT     = 0x0004000000000000,
-	BNXT_ULP_HF_0_2_15_BITMASK_O_UDP_LENGTH       = 0x0002000000000000,
-	BNXT_ULP_HF_0_2_15_BITMASK_O_UDP_CSUM         = 0x0001000000000000,
-	BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_FLAGS      = 0x0000800000000000,
-	BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_RSVD0      = 0x0000400000000000,
-	BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_VNI        = 0x0000200000000000,
-	BNXT_ULP_HF_0_2_15_BITMASK_T_VXLAN_RSVD1      = 0x0000100000000000,
-	BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_DMAC         = 0x0000080000000000,
-	BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_SMAC         = 0x0000040000000000,
-	BNXT_ULP_HF_0_2_15_BITMASK_I_ETH_TYPE         = 0x0000020000000000,
-	BNXT_ULP_HF_0_2_15_BITMASK_I_IPV4_VER         = 0x0000010000000000,
-	BNXT_ULP_HF_0_2_15_BITMASK_I_IPV4_TOS         = 0x0000008000000000,
-	BNXT_ULP_HF_0_2_15_BITMASK_I_IPV4_LEN         = 0x0000004000000000,
-	BNXT_ULP_HF_0_2_15_BITMASK_I_IPV4_FRAG_ID     = 0x0000002000000000,
-	BNXT_ULP_HF_0_2_15_BITMASK_I_IPV4_FRAG_OFF    = 0x0000001000000000,
-	BNXT_ULP_HF_0_2_15_BITMASK_I_IPV4_TTL         = 0x0000000800000000,
-	BNXT_ULP_HF_0_2_15_BITMASK_I_IPV4_PROTO_ID    = 0x0000000400000000,
-	BNXT_ULP_HF_0_2_15_BITMASK_I_IPV4_CSUM        = 0x0000000200000000,
-	BNXT_ULP_HF_0_2_15_BITMASK_I_IPV4_SRC_ADDR    = 0x0000000100000000,
-	BNXT_ULP_HF_0_2_15_BITMASK_I_IPV4_DST_ADDR    = 0x0000000080000000,
-	BNXT_ULP_HF_0_2_15_BITMASK_I_ICMP_TYPE        = 0x0000000040000000,
-	BNXT_ULP_HF_0_2_15_BITMASK_I_ICMP_CODE        = 0x0000000020000000,
-	BNXT_ULP_HF_0_2_15_BITMASK_I_ICMP_CSUM        = 0x0000000010000000,
-	BNXT_ULP_HF_0_2_15_BITMASK_I_ICMP_IDENT       = 0x0000000008000000,
-	BNXT_ULP_HF_0_2_15_BITMASK_I_ICMP_SEQ_NUM     = 0x0000000004000000
+enum bnxt_ulp_hf_0_2_28_bitmask {
+	BNXT_ULP_HF_0_2_28_BITMASK_WM                 = 0x8000000000000000,
+	BNXT_ULP_HF_0_2_28_BITMASK_SVIF_INDEX         = 0x4000000000000000,
+	BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_VER         = 0x2000000000000000,
+	BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_TOS         = 0x1000000000000000,
+	BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_LEN         = 0x0800000000000000,
+	BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_FRAG_ID     = 0x0400000000000000,
+	BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_FRAG_OFF    = 0x0200000000000000,
+	BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_TTL         = 0x0100000000000000,
+	BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_PROTO_ID    = 0x0080000000000000,
+	BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_CSUM        = 0x0040000000000000,
+	BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_SRC_ADDR    = 0x0020000000000000,
+	BNXT_ULP_HF_0_2_28_BITMASK_O_IPV4_DST_ADDR    = 0x0010000000000000,
+	BNXT_ULP_HF_0_2_28_BITMASK_O_UDP_SRC_PORT     = 0x0008000000000000,
+	BNXT_ULP_HF_0_2_28_BITMASK_O_UDP_DST_PORT     = 0x0004000000000000,
+	BNXT_ULP_HF_0_2_28_BITMASK_O_UDP_LENGTH       = 0x0002000000000000,
+	BNXT_ULP_HF_0_2_28_BITMASK_O_UDP_CSUM         = 0x0001000000000000,
+	BNXT_ULP_HF_0_2_28_BITMASK_T_VXLAN_FLAGS      = 0x0000800000000000,
+	BNXT_ULP_HF_0_2_28_BITMASK_T_VXLAN_RSVD0      = 0x0000400000000000,
+	BNXT_ULP_HF_0_2_28_BITMASK_T_VXLAN_VNI        = 0x0000200000000000,
+	BNXT_ULP_HF_0_2_28_BITMASK_T_VXLAN_RSVD1      = 0x0000100000000000,
+	BNXT_ULP_HF_0_2_28_BITMASK_I_ETH_DMAC         = 0x0000080000000000,
+	BNXT_ULP_HF_0_2_28_BITMASK_I_ETH_SMAC         = 0x0000040000000000,
+	BNXT_ULP_HF_0_2_28_BITMASK_I_ETH_TYPE         = 0x0000020000000000,
+	BNXT_ULP_HF_0_2_28_BITMASK_I_IPV4_VER         = 0x0000010000000000,
+	BNXT_ULP_HF_0_2_28_BITMASK_I_IPV4_TOS         = 0x0000008000000000,
+	BNXT_ULP_HF_0_2_28_BITMASK_I_IPV4_LEN         = 0x0000004000000000,
+	BNXT_ULP_HF_0_2_28_BITMASK_I_IPV4_FRAG_ID     = 0x0000002000000000,
+	BNXT_ULP_HF_0_2_28_BITMASK_I_IPV4_FRAG_OFF    = 0x0000001000000000,
+	BNXT_ULP_HF_0_2_28_BITMASK_I_IPV4_TTL         = 0x0000000800000000,
+	BNXT_ULP_HF_0_2_28_BITMASK_I_IPV4_PROTO_ID    = 0x0000000400000000,
+	BNXT_ULP_HF_0_2_28_BITMASK_I_IPV4_CSUM        = 0x0000000200000000,
+	BNXT_ULP_HF_0_2_28_BITMASK_I_IPV4_SRC_ADDR    = 0x0000000100000000,
+	BNXT_ULP_HF_0_2_28_BITMASK_I_IPV4_DST_ADDR    = 0x0000000080000000,
+	BNXT_ULP_HF_0_2_28_BITMASK_I_ICMP_TYPE        = 0x0000000040000000,
+	BNXT_ULP_HF_0_2_28_BITMASK_I_ICMP_CODE        = 0x0000000020000000,
+	BNXT_ULP_HF_0_2_28_BITMASK_I_ICMP_CSUM        = 0x0000000010000000,
+	BNXT_ULP_HF_0_2_28_BITMASK_I_ICMP_IDENT       = 0x0000000008000000,
+	BNXT_ULP_HF_0_2_28_BITMASK_I_ICMP_SEQ_NUM     = 0x0000000004000000
 };
 
-enum bnxt_ulp_hf_0_3_0_bitmask {
-	BNXT_ULP_HF_0_3_0_BITMASK_WM                  = 0x8000000000000000,
-	BNXT_ULP_HF_0_3_0_BITMASK_SVIF_INDEX          = 0x4000000000000000,
-	BNXT_ULP_HF_0_3_0_BITMASK_O_ETH_DMAC          = 0x2000000000000000,
-	BNXT_ULP_HF_0_3_0_BITMASK_O_ETH_SMAC          = 0x1000000000000000,
-	BNXT_ULP_HF_0_3_0_BITMASK_O_ETH_TYPE          = 0x0800000000000000,
-	BNXT_ULP_HF_0_3_0_BITMASK_O_IPV6_VER          = 0x0400000000000000,
-	BNXT_ULP_HF_0_3_0_BITMASK_O_IPV6_TC           = 0x0200000000000000,
-	BNXT_ULP_HF_0_3_0_BITMASK_O_IPV6_FLOW_LABEL   = 0x0100000000000000,
-	BNXT_ULP_HF_0_3_0_BITMASK_O_IPV6_PAYLOAD_LEN  = 0x0080000000000000,
-	BNXT_ULP_HF_0_3_0_BITMASK_O_IPV6_PROTO_ID     = 0x0040000000000000,
-	BNXT_ULP_HF_0_3_0_BITMASK_O_IPV6_TTL          = 0x0020000000000000,
-	BNXT_ULP_HF_0_3_0_BITMASK_O_IPV6_SRC_ADDR     = 0x0010000000000000,
-	BNXT_ULP_HF_0_3_0_BITMASK_O_IPV6_DST_ADDR     = 0x0008000000000000
+enum bnxt_ulp_hf_0_3_29_bitmask {
+	BNXT_ULP_HF_0_3_29_BITMASK_WM                 = 0x8000000000000000,
+	BNXT_ULP_HF_0_3_29_BITMASK_SVIF_INDEX         = 0x4000000000000000,
+	BNXT_ULP_HF_0_3_29_BITMASK_O_ETH_DMAC         = 0x2000000000000000,
+	BNXT_ULP_HF_0_3_29_BITMASK_O_ETH_SMAC         = 0x1000000000000000,
+	BNXT_ULP_HF_0_3_29_BITMASK_O_ETH_TYPE         = 0x0800000000000000,
+	BNXT_ULP_HF_0_3_29_BITMASK_O_IPV6_VER         = 0x0400000000000000,
+	BNXT_ULP_HF_0_3_29_BITMASK_O_IPV6_TC          = 0x0200000000000000,
+	BNXT_ULP_HF_0_3_29_BITMASK_O_IPV6_FLOW_LABEL  = 0x0100000000000000,
+	BNXT_ULP_HF_0_3_29_BITMASK_O_IPV6_PAYLOAD_LEN = 0x0080000000000000,
+	BNXT_ULP_HF_0_3_29_BITMASK_O_IPV6_PROTO_ID    = 0x0040000000000000,
+	BNXT_ULP_HF_0_3_29_BITMASK_O_IPV6_TTL         = 0x0020000000000000,
+	BNXT_ULP_HF_0_3_29_BITMASK_O_IPV6_SRC_ADDR    = 0x0010000000000000,
+	BNXT_ULP_HF_0_3_29_BITMASK_O_IPV6_DST_ADDR    = 0x0008000000000000
 };
 
-enum bnxt_ulp_hf_0_3_1_bitmask {
-	BNXT_ULP_HF_0_3_1_BITMASK_WM                  = 0x8000000000000000,
-	BNXT_ULP_HF_0_3_1_BITMASK_SVIF_INDEX          = 0x4000000000000000,
-	BNXT_ULP_HF_0_3_1_BITMASK_O_ETH_DMAC          = 0x2000000000000000,
-	BNXT_ULP_HF_0_3_1_BITMASK_O_ETH_SMAC          = 0x1000000000000000,
-	BNXT_ULP_HF_0_3_1_BITMASK_O_ETH_TYPE          = 0x0800000000000000,
-	BNXT_ULP_HF_0_3_1_BITMASK_O_IPV4_VER          = 0x0400000000000000,
-	BNXT_ULP_HF_0_3_1_BITMASK_O_IPV4_TOS          = 0x0200000000000000,
-	BNXT_ULP_HF_0_3_1_BITMASK_O_IPV4_LEN          = 0x0100000000000000,
-	BNXT_ULP_HF_0_3_1_BITMASK_O_IPV4_FRAG_ID      = 0x0080000000000000,
-	BNXT_ULP_HF_0_3_1_BITMASK_O_IPV4_FRAG_OFF     = 0x0040000000000000,
-	BNXT_ULP_HF_0_3_1_BITMASK_O_IPV4_TTL          = 0x0020000000000000,
-	BNXT_ULP_HF_0_3_1_BITMASK_O_IPV4_PROTO_ID     = 0x0010000000000000,
-	BNXT_ULP_HF_0_3_1_BITMASK_O_IPV4_CSUM         = 0x0008000000000000,
-	BNXT_ULP_HF_0_3_1_BITMASK_O_IPV4_SRC_ADDR     = 0x0004000000000000,
-	BNXT_ULP_HF_0_3_1_BITMASK_O_IPV4_DST_ADDR     = 0x0002000000000000
+enum bnxt_ulp_hf_0_3_30_bitmask {
+	BNXT_ULP_HF_0_3_30_BITMASK_WM                 = 0x8000000000000000,
+	BNXT_ULP_HF_0_3_30_BITMASK_SVIF_INDEX         = 0x4000000000000000,
+	BNXT_ULP_HF_0_3_30_BITMASK_O_ETH_DMAC         = 0x2000000000000000,
+	BNXT_ULP_HF_0_3_30_BITMASK_O_ETH_SMAC         = 0x1000000000000000,
+	BNXT_ULP_HF_0_3_30_BITMASK_O_ETH_TYPE         = 0x0800000000000000,
+	BNXT_ULP_HF_0_3_30_BITMASK_O_IPV4_VER         = 0x0400000000000000,
+	BNXT_ULP_HF_0_3_30_BITMASK_O_IPV4_TOS         = 0x0200000000000000,
+	BNXT_ULP_HF_0_3_30_BITMASK_O_IPV4_LEN         = 0x0100000000000000,
+	BNXT_ULP_HF_0_3_30_BITMASK_O_IPV4_FRAG_ID     = 0x0080000000000000,
+	BNXT_ULP_HF_0_3_30_BITMASK_O_IPV4_FRAG_OFF    = 0x0040000000000000,
+	BNXT_ULP_HF_0_3_30_BITMASK_O_IPV4_TTL         = 0x0020000000000000,
+	BNXT_ULP_HF_0_3_30_BITMASK_O_IPV4_PROTO_ID    = 0x0010000000000000,
+	BNXT_ULP_HF_0_3_30_BITMASK_O_IPV4_CSUM        = 0x0008000000000000,
+	BNXT_ULP_HF_0_3_30_BITMASK_O_IPV4_SRC_ADDR    = 0x0004000000000000,
+	BNXT_ULP_HF_0_3_30_BITMASK_O_IPV4_DST_ADDR    = 0x0002000000000000
 };
 
-enum bnxt_ulp_hf_0_3_2_bitmask {
-	BNXT_ULP_HF_0_3_2_BITMASK_WM                  = 0x8000000000000000,
-	BNXT_ULP_HF_0_3_2_BITMASK_SVIF_INDEX          = 0x4000000000000000,
-	BNXT_ULP_HF_0_3_2_BITMASK_O_ETH_DMAC          = 0x2000000000000000,
-	BNXT_ULP_HF_0_3_2_BITMASK_O_ETH_SMAC          = 0x1000000000000000,
-	BNXT_ULP_HF_0_3_2_BITMASK_O_ETH_TYPE          = 0x0800000000000000,
-	BNXT_ULP_HF_0_3_2_BITMASK_OO_VLAN_CFI_PRI     = 0x0400000000000000,
-	BNXT_ULP_HF_0_3_2_BITMASK_OO_VLAN_VID         = 0x0200000000000000,
-	BNXT_ULP_HF_0_3_2_BITMASK_OO_VLAN_TYPE        = 0x0100000000000000,
-	BNXT_ULP_HF_0_3_2_BITMASK_O_IPV6_VER          = 0x0080000000000000,
-	BNXT_ULP_HF_0_3_2_BITMASK_O_IPV6_TC           = 0x0040000000000000,
-	BNXT_ULP_HF_0_3_2_BITMASK_O_IPV6_FLOW_LABEL   = 0x0020000000000000,
-	BNXT_ULP_HF_0_3_2_BITMASK_O_IPV6_PAYLOAD_LEN  = 0x0010000000000000,
-	BNXT_ULP_HF_0_3_2_BITMASK_O_IPV6_PROTO_ID     = 0x0008000000000000,
-	BNXT_ULP_HF_0_3_2_BITMASK_O_IPV6_TTL          = 0x0004000000000000,
-	BNXT_ULP_HF_0_3_2_BITMASK_O_IPV6_SRC_ADDR     = 0x0002000000000000,
-	BNXT_ULP_HF_0_3_2_BITMASK_O_IPV6_DST_ADDR     = 0x0001000000000000
+enum bnxt_ulp_hf_0_3_31_bitmask {
+	BNXT_ULP_HF_0_3_31_BITMASK_WM                 = 0x8000000000000000,
+	BNXT_ULP_HF_0_3_31_BITMASK_SVIF_INDEX         = 0x4000000000000000,
+	BNXT_ULP_HF_0_3_31_BITMASK_O_ETH_DMAC         = 0x2000000000000000,
+	BNXT_ULP_HF_0_3_31_BITMASK_O_ETH_SMAC         = 0x1000000000000000,
+	BNXT_ULP_HF_0_3_31_BITMASK_O_ETH_TYPE         = 0x0800000000000000,
+	BNXT_ULP_HF_0_3_31_BITMASK_OO_VLAN_CFI_PRI    = 0x0400000000000000,
+	BNXT_ULP_HF_0_3_31_BITMASK_OO_VLAN_VID        = 0x0200000000000000,
+	BNXT_ULP_HF_0_3_31_BITMASK_OO_VLAN_TYPE       = 0x0100000000000000,
+	BNXT_ULP_HF_0_3_31_BITMASK_O_IPV6_VER         = 0x0080000000000000,
+	BNXT_ULP_HF_0_3_31_BITMASK_O_IPV6_TC          = 0x0040000000000000,
+	BNXT_ULP_HF_0_3_31_BITMASK_O_IPV6_FLOW_LABEL  = 0x0020000000000000,
+	BNXT_ULP_HF_0_3_31_BITMASK_O_IPV6_PAYLOAD_LEN = 0x0010000000000000,
+	BNXT_ULP_HF_0_3_31_BITMASK_O_IPV6_PROTO_ID    = 0x0008000000000000,
+	BNXT_ULP_HF_0_3_31_BITMASK_O_IPV6_TTL         = 0x0004000000000000,
+	BNXT_ULP_HF_0_3_31_BITMASK_O_IPV6_SRC_ADDR    = 0x0002000000000000,
+	BNXT_ULP_HF_0_3_31_BITMASK_O_IPV6_DST_ADDR    = 0x0001000000000000
 };
 
-enum bnxt_ulp_hf_0_3_3_bitmask {
-	BNXT_ULP_HF_0_3_3_BITMASK_WM                  = 0x8000000000000000,
-	BNXT_ULP_HF_0_3_3_BITMASK_SVIF_INDEX          = 0x4000000000000000,
-	BNXT_ULP_HF_0_3_3_BITMASK_O_ETH_DMAC          = 0x2000000000000000,
-	BNXT_ULP_HF_0_3_3_BITMASK_O_ETH_SMAC          = 0x1000000000000000,
-	BNXT_ULP_HF_0_3_3_BITMASK_O_ETH_TYPE          = 0x0800000000000000,
-	BNXT_ULP_HF_0_3_3_BITMASK_OO_VLAN_CFI_PRI     = 0x0400000000000000,
-	BNXT_ULP_HF_0_3_3_BITMASK_OO_VLAN_VID         = 0x0200000000000000,
-	BNXT_ULP_HF_0_3_3_BITMASK_OO_VLAN_TYPE        = 0x0100000000000000,
-	BNXT_ULP_HF_0_3_3_BITMASK_O_IPV4_VER          = 0x0080000000000000,
-	BNXT_ULP_HF_0_3_3_BITMASK_O_IPV4_TOS          = 0x0040000000000000,
-	BNXT_ULP_HF_0_3_3_BITMASK_O_IPV4_LEN          = 0x0020000000000000,
-	BNXT_ULP_HF_0_3_3_BITMASK_O_IPV4_FRAG_ID      = 0x0010000000000000,
-	BNXT_ULP_HF_0_3_3_BITMASK_O_IPV4_FRAG_OFF     = 0x0008000000000000,
-	BNXT_ULP_HF_0_3_3_BITMASK_O_IPV4_TTL          = 0x0004000000000000,
-	BNXT_ULP_HF_0_3_3_BITMASK_O_IPV4_PROTO_ID     = 0x0002000000000000,
-	BNXT_ULP_HF_0_3_3_BITMASK_O_IPV4_CSUM         = 0x0001000000000000,
-	BNXT_ULP_HF_0_3_3_BITMASK_O_IPV4_SRC_ADDR     = 0x0000800000000000,
-	BNXT_ULP_HF_0_3_3_BITMASK_O_IPV4_DST_ADDR     = 0x0000400000000000
+enum bnxt_ulp_hf_0_3_32_bitmask {
+	BNXT_ULP_HF_0_3_32_BITMASK_WM                 = 0x8000000000000000,
+	BNXT_ULP_HF_0_3_32_BITMASK_SVIF_INDEX         = 0x4000000000000000,
+	BNXT_ULP_HF_0_3_32_BITMASK_O_ETH_DMAC         = 0x2000000000000000,
+	BNXT_ULP_HF_0_3_32_BITMASK_O_ETH_SMAC         = 0x1000000000000000,
+	BNXT_ULP_HF_0_3_32_BITMASK_O_ETH_TYPE         = 0x0800000000000000,
+	BNXT_ULP_HF_0_3_32_BITMASK_OO_VLAN_CFI_PRI    = 0x0400000000000000,
+	BNXT_ULP_HF_0_3_32_BITMASK_OO_VLAN_VID        = 0x0200000000000000,
+	BNXT_ULP_HF_0_3_32_BITMASK_OO_VLAN_TYPE       = 0x0100000000000000,
+	BNXT_ULP_HF_0_3_32_BITMASK_O_IPV4_VER         = 0x0080000000000000,
+	BNXT_ULP_HF_0_3_32_BITMASK_O_IPV4_TOS         = 0x0040000000000000,
+	BNXT_ULP_HF_0_3_32_BITMASK_O_IPV4_LEN         = 0x0020000000000000,
+	BNXT_ULP_HF_0_3_32_BITMASK_O_IPV4_FRAG_ID     = 0x0010000000000000,
+	BNXT_ULP_HF_0_3_32_BITMASK_O_IPV4_FRAG_OFF    = 0x0008000000000000,
+	BNXT_ULP_HF_0_3_32_BITMASK_O_IPV4_TTL         = 0x0004000000000000,
+	BNXT_ULP_HF_0_3_32_BITMASK_O_IPV4_PROTO_ID    = 0x0002000000000000,
+	BNXT_ULP_HF_0_3_32_BITMASK_O_IPV4_CSUM        = 0x0001000000000000,
+	BNXT_ULP_HF_0_3_32_BITMASK_O_IPV4_SRC_ADDR    = 0x0000800000000000,
+	BNXT_ULP_HF_0_3_32_BITMASK_O_IPV4_DST_ADDR    = 0x0000400000000000
 };
 
-enum bnxt_ulp_hf_0_3_4_bitmask {
-	BNXT_ULP_HF_0_3_4_BITMASK_WM                  = 0x8000000000000000,
-	BNXT_ULP_HF_0_3_4_BITMASK_SVIF_INDEX          = 0x4000000000000000,
-	BNXT_ULP_HF_0_3_4_BITMASK_O_ETH_DMAC          = 0x2000000000000000,
-	BNXT_ULP_HF_0_3_4_BITMASK_O_ETH_SMAC          = 0x1000000000000000,
-	BNXT_ULP_HF_0_3_4_BITMASK_O_ETH_TYPE          = 0x0800000000000000,
-	BNXT_ULP_HF_0_3_4_BITMASK_O_IPV6_VER          = 0x0400000000000000,
-	BNXT_ULP_HF_0_3_4_BITMASK_O_IPV6_TC           = 0x0200000000000000,
-	BNXT_ULP_HF_0_3_4_BITMASK_O_IPV6_FLOW_LABEL   = 0x0100000000000000,
-	BNXT_ULP_HF_0_3_4_BITMASK_O_IPV6_PAYLOAD_LEN  = 0x0080000000000000,
-	BNXT_ULP_HF_0_3_4_BITMASK_O_IPV6_PROTO_ID     = 0x0040000000000000,
-	BNXT_ULP_HF_0_3_4_BITMASK_O_IPV6_TTL          = 0x0020000000000000,
-	BNXT_ULP_HF_0_3_4_BITMASK_O_IPV6_SRC_ADDR     = 0x0010000000000000,
-	BNXT_ULP_HF_0_3_4_BITMASK_O_IPV6_DST_ADDR     = 0x0008000000000000,
-	BNXT_ULP_HF_0_3_4_BITMASK_O_TCP_SRC_PORT      = 0x0004000000000000,
-	BNXT_ULP_HF_0_3_4_BITMASK_O_TCP_DST_PORT      = 0x0002000000000000,
-	BNXT_ULP_HF_0_3_4_BITMASK_O_TCP_SENT_SEQ      = 0x0001000000000000,
-	BNXT_ULP_HF_0_3_4_BITMASK_O_TCP_RECV_ACK      = 0x0000800000000000,
-	BNXT_ULP_HF_0_3_4_BITMASK_O_TCP_DATA_OFF      = 0x0000400000000000,
-	BNXT_ULP_HF_0_3_4_BITMASK_O_TCP_TCP_FLAGS     = 0x0000200000000000,
-	BNXT_ULP_HF_0_3_4_BITMASK_O_TCP_RX_WIN        = 0x0000100000000000,
-	BNXT_ULP_HF_0_3_4_BITMASK_O_TCP_CSUM          = 0x0000080000000000,
-	BNXT_ULP_HF_0_3_4_BITMASK_O_TCP_URP           = 0x0000040000000000
+enum bnxt_ulp_hf_0_3_33_bitmask {
+	BNXT_ULP_HF_0_3_33_BITMASK_WM                 = 0x8000000000000000,
+	BNXT_ULP_HF_0_3_33_BITMASK_SVIF_INDEX         = 0x4000000000000000,
+	BNXT_ULP_HF_0_3_33_BITMASK_O_ETH_DMAC         = 0x2000000000000000,
+	BNXT_ULP_HF_0_3_33_BITMASK_O_ETH_SMAC         = 0x1000000000000000,
+	BNXT_ULP_HF_0_3_33_BITMASK_O_ETH_TYPE         = 0x0800000000000000,
+	BNXT_ULP_HF_0_3_33_BITMASK_O_IPV6_VER         = 0x0400000000000000,
+	BNXT_ULP_HF_0_3_33_BITMASK_O_IPV6_TC          = 0x0200000000000000,
+	BNXT_ULP_HF_0_3_33_BITMASK_O_IPV6_FLOW_LABEL  = 0x0100000000000000,
+	BNXT_ULP_HF_0_3_33_BITMASK_O_IPV6_PAYLOAD_LEN = 0x0080000000000000,
+	BNXT_ULP_HF_0_3_33_BITMASK_O_IPV6_PROTO_ID    = 0x0040000000000000,
+	BNXT_ULP_HF_0_3_33_BITMASK_O_IPV6_TTL         = 0x0020000000000000,
+	BNXT_ULP_HF_0_3_33_BITMASK_O_IPV6_SRC_ADDR    = 0x0010000000000000,
+	BNXT_ULP_HF_0_3_33_BITMASK_O_IPV6_DST_ADDR    = 0x0008000000000000,
+	BNXT_ULP_HF_0_3_33_BITMASK_O_TCP_SRC_PORT     = 0x0004000000000000,
+	BNXT_ULP_HF_0_3_33_BITMASK_O_TCP_DST_PORT     = 0x0002000000000000,
+	BNXT_ULP_HF_0_3_33_BITMASK_O_TCP_SENT_SEQ     = 0x0001000000000000,
+	BNXT_ULP_HF_0_3_33_BITMASK_O_TCP_RECV_ACK     = 0x0000800000000000,
+	BNXT_ULP_HF_0_3_33_BITMASK_O_TCP_DATA_OFF     = 0x0000400000000000,
+	BNXT_ULP_HF_0_3_33_BITMASK_O_TCP_TCP_FLAGS    = 0x0000200000000000,
+	BNXT_ULP_HF_0_3_33_BITMASK_O_TCP_RX_WIN       = 0x0000100000000000,
+	BNXT_ULP_HF_0_3_33_BITMASK_O_TCP_CSUM         = 0x0000080000000000,
+	BNXT_ULP_HF_0_3_33_BITMASK_O_TCP_URP          = 0x0000040000000000
 };
 
-enum bnxt_ulp_hf_0_3_5_bitmask {
-	BNXT_ULP_HF_0_3_5_BITMASK_WM                  = 0x8000000000000000,
-	BNXT_ULP_HF_0_3_5_BITMASK_SVIF_INDEX          = 0x4000000000000000,
-	BNXT_ULP_HF_0_3_5_BITMASK_O_ETH_DMAC          = 0x2000000000000000,
-	BNXT_ULP_HF_0_3_5_BITMASK_O_ETH_SMAC          = 0x1000000000000000,
-	BNXT_ULP_HF_0_3_5_BITMASK_O_ETH_TYPE          = 0x0800000000000000,
-	BNXT_ULP_HF_0_3_5_BITMASK_O_IPV4_VER          = 0x0400000000000000,
-	BNXT_ULP_HF_0_3_5_BITMASK_O_IPV4_TOS          = 0x0200000000000000,
-	BNXT_ULP_HF_0_3_5_BITMASK_O_IPV4_LEN          = 0x0100000000000000,
-	BNXT_ULP_HF_0_3_5_BITMASK_O_IPV4_FRAG_ID      = 0x0080000000000000,
-	BNXT_ULP_HF_0_3_5_BITMASK_O_IPV4_FRAG_OFF     = 0x0040000000000000,
-	BNXT_ULP_HF_0_3_5_BITMASK_O_IPV4_TTL          = 0x0020000000000000,
-	BNXT_ULP_HF_0_3_5_BITMASK_O_IPV4_PROTO_ID     = 0x0010000000000000,
-	BNXT_ULP_HF_0_3_5_BITMASK_O_IPV4_CSUM         = 0x0008000000000000,
-	BNXT_ULP_HF_0_3_5_BITMASK_O_IPV4_SRC_ADDR     = 0x0004000000000000,
-	BNXT_ULP_HF_0_3_5_BITMASK_O_IPV4_DST_ADDR     = 0x0002000000000000,
-	BNXT_ULP_HF_0_3_5_BITMASK_O_TCP_SRC_PORT      = 0x0001000000000000,
-	BNXT_ULP_HF_0_3_5_BITMASK_O_TCP_DST_PORT      = 0x0000800000000000,
-	BNXT_ULP_HF_0_3_5_BITMASK_O_TCP_SENT_SEQ      = 0x0000400000000000,
-	BNXT_ULP_HF_0_3_5_BITMASK_O_TCP_RECV_ACK      = 0x0000200000000000,
-	BNXT_ULP_HF_0_3_5_BITMASK_O_TCP_DATA_OFF      = 0x0000100000000000,
-	BNXT_ULP_HF_0_3_5_BITMASK_O_TCP_TCP_FLAGS     = 0x0000080000000000,
-	BNXT_ULP_HF_0_3_5_BITMASK_O_TCP_RX_WIN        = 0x0000040000000000,
-	BNXT_ULP_HF_0_3_5_BITMASK_O_TCP_CSUM          = 0x0000020000000000,
-	BNXT_ULP_HF_0_3_5_BITMASK_O_TCP_URP           = 0x0000010000000000
+enum bnxt_ulp_hf_0_3_34_bitmask {
+	BNXT_ULP_HF_0_3_34_BITMASK_WM                 = 0x8000000000000000,
+	BNXT_ULP_HF_0_3_34_BITMASK_SVIF_INDEX         = 0x4000000000000000,
+	BNXT_ULP_HF_0_3_34_BITMASK_O_ETH_DMAC         = 0x2000000000000000,
+	BNXT_ULP_HF_0_3_34_BITMASK_O_ETH_SMAC         = 0x1000000000000000,
+	BNXT_ULP_HF_0_3_34_BITMASK_O_ETH_TYPE         = 0x0800000000000000,
+	BNXT_ULP_HF_0_3_34_BITMASK_O_IPV4_VER         = 0x0400000000000000,
+	BNXT_ULP_HF_0_3_34_BITMASK_O_IPV4_TOS         = 0x0200000000000000,
+	BNXT_ULP_HF_0_3_34_BITMASK_O_IPV4_LEN         = 0x0100000000000000,
+	BNXT_ULP_HF_0_3_34_BITMASK_O_IPV4_FRAG_ID     = 0x0080000000000000,
+	BNXT_ULP_HF_0_3_34_BITMASK_O_IPV4_FRAG_OFF    = 0x0040000000000000,
+	BNXT_ULP_HF_0_3_34_BITMASK_O_IPV4_TTL         = 0x0020000000000000,
+	BNXT_ULP_HF_0_3_34_BITMASK_O_IPV4_PROTO_ID    = 0x0010000000000000,
+	BNXT_ULP_HF_0_3_34_BITMASK_O_IPV4_CSUM        = 0x0008000000000000,
+	BNXT_ULP_HF_0_3_34_BITMASK_O_IPV4_SRC_ADDR    = 0x0004000000000000,
+	BNXT_ULP_HF_0_3_34_BITMASK_O_IPV4_DST_ADDR    = 0x0002000000000000,
+	BNXT_ULP_HF_0_3_34_BITMASK_O_TCP_SRC_PORT     = 0x0001000000000000,
+	BNXT_ULP_HF_0_3_34_BITMASK_O_TCP_DST_PORT     = 0x0000800000000000,
+	BNXT_ULP_HF_0_3_34_BITMASK_O_TCP_SENT_SEQ     = 0x0000400000000000,
+	BNXT_ULP_HF_0_3_34_BITMASK_O_TCP_RECV_ACK     = 0x0000200000000000,
+	BNXT_ULP_HF_0_3_34_BITMASK_O_TCP_DATA_OFF     = 0x0000100000000000,
+	BNXT_ULP_HF_0_3_34_BITMASK_O_TCP_TCP_FLAGS    = 0x0000080000000000,
+	BNXT_ULP_HF_0_3_34_BITMASK_O_TCP_RX_WIN       = 0x0000040000000000,
+	BNXT_ULP_HF_0_3_34_BITMASK_O_TCP_CSUM         = 0x0000020000000000,
+	BNXT_ULP_HF_0_3_34_BITMASK_O_TCP_URP          = 0x0000010000000000
 };
 
-enum bnxt_ulp_hf_0_3_6_bitmask {
-	BNXT_ULP_HF_0_3_6_BITMASK_WM                  = 0x8000000000000000,
-	BNXT_ULP_HF_0_3_6_BITMASK_SVIF_INDEX          = 0x4000000000000000,
-	BNXT_ULP_HF_0_3_6_BITMASK_O_ETH_DMAC          = 0x2000000000000000,
-	BNXT_ULP_HF_0_3_6_BITMASK_O_ETH_SMAC          = 0x1000000000000000,
-	BNXT_ULP_HF_0_3_6_BITMASK_O_ETH_TYPE          = 0x0800000000000000,
-	BNXT_ULP_HF_0_3_6_BITMASK_O_IPV6_VER          = 0x0400000000000000,
-	BNXT_ULP_HF_0_3_6_BITMASK_O_IPV6_TC           = 0x0200000000000000,
-	BNXT_ULP_HF_0_3_6_BITMASK_O_IPV6_FLOW_LABEL   = 0x0100000000000000,
-	BNXT_ULP_HF_0_3_6_BITMASK_O_IPV6_PAYLOAD_LEN  = 0x0080000000000000,
-	BNXT_ULP_HF_0_3_6_BITMASK_O_IPV6_PROTO_ID     = 0x0040000000000000,
-	BNXT_ULP_HF_0_3_6_BITMASK_O_IPV6_TTL          = 0x0020000000000000,
-	BNXT_ULP_HF_0_3_6_BITMASK_O_IPV6_SRC_ADDR     = 0x0010000000000000,
-	BNXT_ULP_HF_0_3_6_BITMASK_O_IPV6_DST_ADDR     = 0x0008000000000000,
-	BNXT_ULP_HF_0_3_6_BITMASK_O_UDP_SRC_PORT      = 0x0004000000000000,
-	BNXT_ULP_HF_0_3_6_BITMASK_O_UDP_DST_PORT      = 0x0002000000000000,
-	BNXT_ULP_HF_0_3_6_BITMASK_O_UDP_LENGTH        = 0x0001000000000000,
-	BNXT_ULP_HF_0_3_6_BITMASK_O_UDP_CSUM          = 0x0000800000000000
+enum bnxt_ulp_hf_0_3_35_bitmask {
+	BNXT_ULP_HF_0_3_35_BITMASK_WM                 = 0x8000000000000000,
+	BNXT_ULP_HF_0_3_35_BITMASK_SVIF_INDEX         = 0x4000000000000000,
+	BNXT_ULP_HF_0_3_35_BITMASK_O_ETH_DMAC         = 0x2000000000000000,
+	BNXT_ULP_HF_0_3_35_BITMASK_O_ETH_SMAC         = 0x1000000000000000,
+	BNXT_ULP_HF_0_3_35_BITMASK_O_ETH_TYPE         = 0x0800000000000000,
+	BNXT_ULP_HF_0_3_35_BITMASK_O_IPV6_VER         = 0x0400000000000000,
+	BNXT_ULP_HF_0_3_35_BITMASK_O_IPV6_TC          = 0x0200000000000000,
+	BNXT_ULP_HF_0_3_35_BITMASK_O_IPV6_FLOW_LABEL  = 0x0100000000000000,
+	BNXT_ULP_HF_0_3_35_BITMASK_O_IPV6_PAYLOAD_LEN = 0x0080000000000000,
+	BNXT_ULP_HF_0_3_35_BITMASK_O_IPV6_PROTO_ID    = 0x0040000000000000,
+	BNXT_ULP_HF_0_3_35_BITMASK_O_IPV6_TTL         = 0x0020000000000000,
+	BNXT_ULP_HF_0_3_35_BITMASK_O_IPV6_SRC_ADDR    = 0x0010000000000000,
+	BNXT_ULP_HF_0_3_35_BITMASK_O_IPV6_DST_ADDR    = 0x0008000000000000,
+	BNXT_ULP_HF_0_3_35_BITMASK_O_UDP_SRC_PORT     = 0x0004000000000000,
+	BNXT_ULP_HF_0_3_35_BITMASK_O_UDP_DST_PORT     = 0x0002000000000000,
+	BNXT_ULP_HF_0_3_35_BITMASK_O_UDP_LENGTH       = 0x0001000000000000,
+	BNXT_ULP_HF_0_3_35_BITMASK_O_UDP_CSUM         = 0x0000800000000000
 };
 
-enum bnxt_ulp_hf_0_3_7_bitmask {
-	BNXT_ULP_HF_0_3_7_BITMASK_WM                  = 0x8000000000000000,
-	BNXT_ULP_HF_0_3_7_BITMASK_SVIF_INDEX          = 0x4000000000000000,
-	BNXT_ULP_HF_0_3_7_BITMASK_O_ETH_DMAC          = 0x2000000000000000,
-	BNXT_ULP_HF_0_3_7_BITMASK_O_ETH_SMAC          = 0x1000000000000000,
-	BNXT_ULP_HF_0_3_7_BITMASK_O_ETH_TYPE          = 0x0800000000000000,
-	BNXT_ULP_HF_0_3_7_BITMASK_O_IPV4_VER          = 0x0400000000000000,
-	BNXT_ULP_HF_0_3_7_BITMASK_O_IPV4_TOS          = 0x0200000000000000,
-	BNXT_ULP_HF_0_3_7_BITMASK_O_IPV4_LEN          = 0x0100000000000000,
-	BNXT_ULP_HF_0_3_7_BITMASK_O_IPV4_FRAG_ID      = 0x0080000000000000,
-	BNXT_ULP_HF_0_3_7_BITMASK_O_IPV4_FRAG_OFF     = 0x0040000000000000,
-	BNXT_ULP_HF_0_3_7_BITMASK_O_IPV4_TTL          = 0x0020000000000000,
-	BNXT_ULP_HF_0_3_7_BITMASK_O_IPV4_PROTO_ID     = 0x0010000000000000,
-	BNXT_ULP_HF_0_3_7_BITMASK_O_IPV4_CSUM         = 0x0008000000000000,
-	BNXT_ULP_HF_0_3_7_BITMASK_O_IPV4_SRC_ADDR     = 0x0004000000000000,
-	BNXT_ULP_HF_0_3_7_BITMASK_O_IPV4_DST_ADDR     = 0x0002000000000000,
-	BNXT_ULP_HF_0_3_7_BITMASK_O_UDP_SRC_PORT      = 0x0001000000000000,
-	BNXT_ULP_HF_0_3_7_BITMASK_O_UDP_DST_PORT      = 0x0000800000000000,
-	BNXT_ULP_HF_0_3_7_BITMASK_O_UDP_LENGTH        = 0x0000400000000000,
-	BNXT_ULP_HF_0_3_7_BITMASK_O_UDP_CSUM          = 0x0000200000000000
+enum bnxt_ulp_hf_0_3_36_bitmask {
+	BNXT_ULP_HF_0_3_36_BITMASK_WM                 = 0x8000000000000000,
+	BNXT_ULP_HF_0_3_36_BITMASK_SVIF_INDEX         = 0x4000000000000000,
+	BNXT_ULP_HF_0_3_36_BITMASK_O_ETH_DMAC         = 0x2000000000000000,
+	BNXT_ULP_HF_0_3_36_BITMASK_O_ETH_SMAC         = 0x1000000000000000,
+	BNXT_ULP_HF_0_3_36_BITMASK_O_ETH_TYPE         = 0x0800000000000000,
+	BNXT_ULP_HF_0_3_36_BITMASK_O_IPV4_VER         = 0x0400000000000000,
+	BNXT_ULP_HF_0_3_36_BITMASK_O_IPV4_TOS         = 0x0200000000000000,
+	BNXT_ULP_HF_0_3_36_BITMASK_O_IPV4_LEN         = 0x0100000000000000,
+	BNXT_ULP_HF_0_3_36_BITMASK_O_IPV4_FRAG_ID     = 0x0080000000000000,
+	BNXT_ULP_HF_0_3_36_BITMASK_O_IPV4_FRAG_OFF    = 0x0040000000000000,
+	BNXT_ULP_HF_0_3_36_BITMASK_O_IPV4_TTL         = 0x0020000000000000,
+	BNXT_ULP_HF_0_3_36_BITMASK_O_IPV4_PROTO_ID    = 0x0010000000000000,
+	BNXT_ULP_HF_0_3_36_BITMASK_O_IPV4_CSUM        = 0x0008000000000000,
+	BNXT_ULP_HF_0_3_36_BITMASK_O_IPV4_SRC_ADDR    = 0x0004000000000000,
+	BNXT_ULP_HF_0_3_36_BITMASK_O_IPV4_DST_ADDR    = 0x0002000000000000,
+	BNXT_ULP_HF_0_3_36_BITMASK_O_UDP_SRC_PORT     = 0x0001000000000000,
+	BNXT_ULP_HF_0_3_36_BITMASK_O_UDP_DST_PORT     = 0x0000800000000000,
+	BNXT_ULP_HF_0_3_36_BITMASK_O_UDP_LENGTH       = 0x0000400000000000,
+	BNXT_ULP_HF_0_3_36_BITMASK_O_UDP_CSUM         = 0x0000200000000000
 };
 
-enum bnxt_ulp_hf_0_3_8_bitmask {
-	BNXT_ULP_HF_0_3_8_BITMASK_WM                  = 0x8000000000000000,
-	BNXT_ULP_HF_0_3_8_BITMASK_SVIF_INDEX          = 0x4000000000000000,
-	BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_DMAC          = 0x2000000000000000,
-	BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_SMAC          = 0x1000000000000000,
-	BNXT_ULP_HF_0_3_8_BITMASK_O_ETH_TYPE          = 0x0800000000000000,
-	BNXT_ULP_HF_0_3_8_BITMASK_OO_VLAN_CFI_PRI     = 0x0400000000000000,
-	BNXT_ULP_HF_0_3_8_BITMASK_OO_VLAN_VID         = 0x0200000000000000,
-	BNXT_ULP_HF_0_3_8_BITMASK_OO_VLAN_TYPE        = 0x0100000000000000,
-	BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_VER          = 0x0080000000000000,
-	BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_TC           = 0x0040000000000000,
-	BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_FLOW_LABEL   = 0x0020000000000000,
-	BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_PAYLOAD_LEN  = 0x0010000000000000,
-	BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_PROTO_ID     = 0x0008000000000000,
-	BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_TTL          = 0x0004000000000000,
-	BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_SRC_ADDR     = 0x0002000000000000,
-	BNXT_ULP_HF_0_3_8_BITMASK_O_IPV6_DST_ADDR     = 0x0001000000000000,
-	BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_SRC_PORT      = 0x0000800000000000,
-	BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_DST_PORT      = 0x0000400000000000,
-	BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_SENT_SEQ      = 0x0000200000000000,
-	BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_RECV_ACK      = 0x0000100000000000,
-	BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_DATA_OFF      = 0x0000080000000000,
-	BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_TCP_FLAGS     = 0x0000040000000000,
-	BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_RX_WIN        = 0x0000020000000000,
-	BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_CSUM          = 0x0000010000000000,
-	BNXT_ULP_HF_0_3_8_BITMASK_O_TCP_URP           = 0x0000008000000000
+enum bnxt_ulp_hf_0_3_37_bitmask {
+	BNXT_ULP_HF_0_3_37_BITMASK_WM                 = 0x8000000000000000,
+	BNXT_ULP_HF_0_3_37_BITMASK_SVIF_INDEX         = 0x4000000000000000,
+	BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_DMAC         = 0x2000000000000000,
+	BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_SMAC         = 0x1000000000000000,
+	BNXT_ULP_HF_0_3_37_BITMASK_O_ETH_TYPE         = 0x0800000000000000,
+	BNXT_ULP_HF_0_3_37_BITMASK_OO_VLAN_CFI_PRI    = 0x0400000000000000,
+	BNXT_ULP_HF_0_3_37_BITMASK_OO_VLAN_VID        = 0x0200000000000000,
+	BNXT_ULP_HF_0_3_37_BITMASK_OO_VLAN_TYPE       = 0x0100000000000000,
+	BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_VER         = 0x0080000000000000,
+	BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_TC          = 0x0040000000000000,
+	BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_FLOW_LABEL  = 0x0020000000000000,
+	BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_PAYLOAD_LEN = 0x0010000000000000,
+	BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_PROTO_ID    = 0x0008000000000000,
+	BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_TTL         = 0x0004000000000000,
+	BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_SRC_ADDR    = 0x0002000000000000,
+	BNXT_ULP_HF_0_3_37_BITMASK_O_IPV6_DST_ADDR    = 0x0001000000000000,
+	BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_SRC_PORT     = 0x0000800000000000,
+	BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_DST_PORT     = 0x0000400000000000,
+	BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_SENT_SEQ     = 0x0000200000000000,
+	BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_RECV_ACK     = 0x0000100000000000,
+	BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_DATA_OFF     = 0x0000080000000000,
+	BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_TCP_FLAGS    = 0x0000040000000000,
+	BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_RX_WIN       = 0x0000020000000000,
+	BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_CSUM         = 0x0000010000000000,
+	BNXT_ULP_HF_0_3_37_BITMASK_O_TCP_URP          = 0x0000008000000000
 };
 
-enum bnxt_ulp_hf_0_3_9_bitmask {
-	BNXT_ULP_HF_0_3_9_BITMASK_WM                  = 0x8000000000000000,
-	BNXT_ULP_HF_0_3_9_BITMASK_SVIF_INDEX          = 0x4000000000000000,
-	BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_DMAC          = 0x2000000000000000,
-	BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_SMAC          = 0x1000000000000000,
-	BNXT_ULP_HF_0_3_9_BITMASK_O_ETH_TYPE          = 0x0800000000000000,
-	BNXT_ULP_HF_0_3_9_BITMASK_OO_VLAN_CFI_PRI     = 0x0400000000000000,
-	BNXT_ULP_HF_0_3_9_BITMASK_OO_VLAN_VID         = 0x0200000000000000,
-	BNXT_ULP_HF_0_3_9_BITMASK_OO_VLAN_TYPE        = 0x0100000000000000,
-	BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_VER          = 0x0080000000000000,
-	BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_TOS          = 0x0040000000000000,
-	BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_LEN          = 0x0020000000000000,
-	BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_FRAG_ID      = 0x0010000000000000,
-	BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_FRAG_OFF     = 0x0008000000000000,
-	BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_TTL          = 0x0004000000000000,
-	BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_PROTO_ID     = 0x0002000000000000,
-	BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_CSUM         = 0x0001000000000000,
-	BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_SRC_ADDR     = 0x0000800000000000,
-	BNXT_ULP_HF_0_3_9_BITMASK_O_IPV4_DST_ADDR     = 0x0000400000000000,
-	BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_SRC_PORT      = 0x0000200000000000,
-	BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_DST_PORT      = 0x0000100000000000,
-	BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_SENT_SEQ      = 0x0000080000000000,
-	BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_RECV_ACK      = 0x0000040000000000,
-	BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_DATA_OFF      = 0x0000020000000000,
-	BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_TCP_FLAGS     = 0x0000010000000000,
-	BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_RX_WIN        = 0x0000008000000000,
-	BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_CSUM          = 0x0000004000000000,
-	BNXT_ULP_HF_0_3_9_BITMASK_O_TCP_URP           = 0x0000002000000000
+enum bnxt_ulp_hf_0_3_38_bitmask {
+	BNXT_ULP_HF_0_3_38_BITMASK_WM                 = 0x8000000000000000,
+	BNXT_ULP_HF_0_3_38_BITMASK_SVIF_INDEX         = 0x4000000000000000,
+	BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_DMAC         = 0x2000000000000000,
+	BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_SMAC         = 0x1000000000000000,
+	BNXT_ULP_HF_0_3_38_BITMASK_O_ETH_TYPE         = 0x0800000000000000,
+	BNXT_ULP_HF_0_3_38_BITMASK_OO_VLAN_CFI_PRI    = 0x0400000000000000,
+	BNXT_ULP_HF_0_3_38_BITMASK_OO_VLAN_VID        = 0x0200000000000000,
+	BNXT_ULP_HF_0_3_38_BITMASK_OO_VLAN_TYPE       = 0x0100000000000000,
+	BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_VER         = 0x0080000000000000,
+	BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_TOS         = 0x0040000000000000,
+	BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_LEN         = 0x0020000000000000,
+	BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_FRAG_ID     = 0x0010000000000000,
+	BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_FRAG_OFF    = 0x0008000000000000,
+	BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_TTL         = 0x0004000000000000,
+	BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_PROTO_ID    = 0x0002000000000000,
+	BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_CSUM        = 0x0001000000000000,
+	BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_SRC_ADDR    = 0x0000800000000000,
+	BNXT_ULP_HF_0_3_38_BITMASK_O_IPV4_DST_ADDR    = 0x0000400000000000,
+	BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_SRC_PORT     = 0x0000200000000000,
+	BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_DST_PORT     = 0x0000100000000000,
+	BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_SENT_SEQ     = 0x0000080000000000,
+	BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_RECV_ACK     = 0x0000040000000000,
+	BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_DATA_OFF     = 0x0000020000000000,
+	BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_TCP_FLAGS    = 0x0000010000000000,
+	BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_RX_WIN       = 0x0000008000000000,
+	BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_CSUM         = 0x0000004000000000,
+	BNXT_ULP_HF_0_3_38_BITMASK_O_TCP_URP          = 0x0000002000000000
 };
 
-enum bnxt_ulp_hf_0_3_10_bitmask {
-	BNXT_ULP_HF_0_3_10_BITMASK_WM                 = 0x8000000000000000,
-	BNXT_ULP_HF_0_3_10_BITMASK_SVIF_INDEX         = 0x4000000000000000,
-	BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_DMAC         = 0x2000000000000000,
-	BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_SMAC         = 0x1000000000000000,
-	BNXT_ULP_HF_0_3_10_BITMASK_O_ETH_TYPE         = 0x0800000000000000,
-	BNXT_ULP_HF_0_3_10_BITMASK_OO_VLAN_CFI_PRI    = 0x0400000000000000,
-	BNXT_ULP_HF_0_3_10_BITMASK_OO_VLAN_VID        = 0x0200000000000000,
-	BNXT_ULP_HF_0_3_10_BITMASK_OO_VLAN_TYPE       = 0x0100000000000000,
-	BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_VER         = 0x0080000000000000,
-	BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_TC          = 0x0040000000000000,
-	BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_FLOW_LABEL  = 0x0020000000000000,
-	BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_PAYLOAD_LEN = 0x0010000000000000,
-	BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_PROTO_ID    = 0x0008000000000000,
-	BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_TTL         = 0x0004000000000000,
-	BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_SRC_ADDR    = 0x0002000000000000,
-	BNXT_ULP_HF_0_3_10_BITMASK_O_IPV6_DST_ADDR    = 0x0001000000000000,
-	BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_SRC_PORT     = 0x0000800000000000,
-	BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_DST_PORT     = 0x0000400000000000,
-	BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_LENGTH       = 0x0000200000000000,
-	BNXT_ULP_HF_0_3_10_BITMASK_O_UDP_CSUM         = 0x0000100000000000
+enum bnxt_ulp_hf_0_3_39_bitmask {
+	BNXT_ULP_HF_0_3_39_BITMASK_WM                 = 0x8000000000000000,
+	BNXT_ULP_HF_0_3_39_BITMASK_SVIF_INDEX         = 0x4000000000000000,
+	BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_DMAC         = 0x2000000000000000,
+	BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_SMAC         = 0x1000000000000000,
+	BNXT_ULP_HF_0_3_39_BITMASK_O_ETH_TYPE         = 0x0800000000000000,
+	BNXT_ULP_HF_0_3_39_BITMASK_OO_VLAN_CFI_PRI    = 0x0400000000000000,
+	BNXT_ULP_HF_0_3_39_BITMASK_OO_VLAN_VID        = 0x0200000000000000,
+	BNXT_ULP_HF_0_3_39_BITMASK_OO_VLAN_TYPE       = 0x0100000000000000,
+	BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_VER         = 0x0080000000000000,
+	BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_TC          = 0x0040000000000000,
+	BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_FLOW_LABEL  = 0x0020000000000000,
+	BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_PAYLOAD_LEN = 0x0010000000000000,
+	BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_PROTO_ID    = 0x0008000000000000,
+	BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_TTL         = 0x0004000000000000,
+	BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_SRC_ADDR    = 0x0002000000000000,
+	BNXT_ULP_HF_0_3_39_BITMASK_O_IPV6_DST_ADDR    = 0x0001000000000000,
+	BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_SRC_PORT     = 0x0000800000000000,
+	BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_DST_PORT     = 0x0000400000000000,
+	BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_LENGTH       = 0x0000200000000000,
+	BNXT_ULP_HF_0_3_39_BITMASK_O_UDP_CSUM         = 0x0000100000000000
 };
 
-enum bnxt_ulp_hf_0_3_11_bitmask {
-	BNXT_ULP_HF_0_3_11_BITMASK_WM                 = 0x8000000000000000,
-	BNXT_ULP_HF_0_3_11_BITMASK_SVIF_INDEX         = 0x4000000000000000,
-	BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_DMAC         = 0x2000000000000000,
-	BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_SMAC         = 0x1000000000000000,
-	BNXT_ULP_HF_0_3_11_BITMASK_O_ETH_TYPE         = 0x0800000000000000,
-	BNXT_ULP_HF_0_3_11_BITMASK_OO_VLAN_CFI_PRI    = 0x0400000000000000,
-	BNXT_ULP_HF_0_3_11_BITMASK_OO_VLAN_VID        = 0x0200000000000000,
-	BNXT_ULP_HF_0_3_11_BITMASK_OO_VLAN_TYPE       = 0x0100000000000000,
-	BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_VER         = 0x0080000000000000,
-	BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_TOS         = 0x0040000000000000,
-	BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_LEN         = 0x0020000000000000,
-	BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_FRAG_ID     = 0x0010000000000000,
-	BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_FRAG_OFF    = 0x0008000000000000,
-	BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_TTL         = 0x0004000000000000,
-	BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_PROTO_ID    = 0x0002000000000000,
-	BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_CSUM        = 0x0001000000000000,
-	BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_SRC_ADDR    = 0x0000800000000000,
-	BNXT_ULP_HF_0_3_11_BITMASK_O_IPV4_DST_ADDR    = 0x0000400000000000,
-	BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_SRC_PORT     = 0x0000200000000000,
-	BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_DST_PORT     = 0x0000100000000000,
-	BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_LENGTH       = 0x0000080000000000,
-	BNXT_ULP_HF_0_3_11_BITMASK_O_UDP_CSUM         = 0x0000040000000000
+enum bnxt_ulp_hf_0_3_40_bitmask {
+	BNXT_ULP_HF_0_3_40_BITMASK_WM                 = 0x8000000000000000,
+	BNXT_ULP_HF_0_3_40_BITMASK_SVIF_INDEX         = 0x4000000000000000,
+	BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_DMAC         = 0x2000000000000000,
+	BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_SMAC         = 0x1000000000000000,
+	BNXT_ULP_HF_0_3_40_BITMASK_O_ETH_TYPE         = 0x0800000000000000,
+	BNXT_ULP_HF_0_3_40_BITMASK_OO_VLAN_CFI_PRI    = 0x0400000000000000,
+	BNXT_ULP_HF_0_3_40_BITMASK_OO_VLAN_VID        = 0x0200000000000000,
+	BNXT_ULP_HF_0_3_40_BITMASK_OO_VLAN_TYPE       = 0x0100000000000000,
+	BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_VER         = 0x0080000000000000,
+	BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_TOS         = 0x0040000000000000,
+	BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_LEN         = 0x0020000000000000,
+	BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_FRAG_ID     = 0x0010000000000000,
+	BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_FRAG_OFF    = 0x0008000000000000,
+	BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_TTL         = 0x0004000000000000,
+	BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_PROTO_ID    = 0x0002000000000000,
+	BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_CSUM        = 0x0001000000000000,
+	BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_SRC_ADDR    = 0x0000800000000000,
+	BNXT_ULP_HF_0_3_40_BITMASK_O_IPV4_DST_ADDR    = 0x0000400000000000,
+	BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_SRC_PORT     = 0x0000200000000000,
+	BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_DST_PORT     = 0x0000100000000000,
+	BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_LENGTH       = 0x0000080000000000,
+	BNXT_ULP_HF_0_3_40_BITMASK_O_UDP_CSUM         = 0x0000040000000000
 };
 
 #endif
diff --git a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_tbl.c b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_tbl.c
index 4d325928e5..2b29d12cde 100644
--- a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_tbl.c
+++ b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_tbl.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2014-2023 Broadcom
+ * Copyright(c) 2014-2024 Broadcom
  * All rights reserved.
  */
 
@@ -70,6 +70,26 @@ struct bnxt_ulp_generic_tbl_params ulp_generic_tbl_params[] = {
 	.hash_tbl_entries        = 0,
 	.result_byte_order       = BNXT_ULP_BYTE_ORDER_LE
 	},
+	[BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_MULTI_SHARED_MIRROR << 1 |
+		BNXT_ULP_DIRECTION_INGRESS] = {
+	.name                    = "INGRESS GENERIC_TABLE_SHARED_MIRROR",
+	.result_num_entries      = 16,
+	.result_num_bytes        = 8,
+	.key_num_bytes           = 0,
+	.num_buckets             = 0,
+	.hash_tbl_entries        = 0,
+	.result_byte_order       = BNXT_ULP_BYTE_ORDER_LE
+	},
+	[BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_MULTI_SHARED_MIRROR << 1 |
+		BNXT_ULP_DIRECTION_EGRESS] = {
+	.name                    = "EGRESS GENERIC_TABLE_SHARED_MIRROR",
+	.result_num_entries      = 16,
+	.result_num_bytes        = 8,
+	.key_num_bytes           = 0,
+	.num_buckets             = 0,
+	.hash_tbl_entries        = 0,
+	.result_byte_order       = BNXT_ULP_BYTE_ORDER_LE
+	},
 	[BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_MAC_ADDR_CACHE << 1 |
 		BNXT_ULP_DIRECTION_INGRESS] = {
 	.name                    = "INGRESS GENERIC_TABLE_MAC_ADDR_CACHE",
@@ -94,7 +114,7 @@ struct bnxt_ulp_generic_tbl_params ulp_generic_tbl_params[] = {
 		BNXT_ULP_DIRECTION_INGRESS] = {
 	.name                    = "INGRESS GENERIC_TABLE_PORT_TABLE",
 	.result_num_entries      = 1024,
-	.result_num_bytes        = 21,
+	.result_num_bytes        = 25,
 	.key_num_bytes           = 0,
 	.num_buckets             = 0,
 	.hash_tbl_entries        = 0,
@@ -104,7 +124,7 @@ struct bnxt_ulp_generic_tbl_params ulp_generic_tbl_params[] = {
 		BNXT_ULP_DIRECTION_EGRESS] = {
 	.name                    = "EGRESS GENERIC_TABLE_PORT_TABLE",
 	.result_num_entries      = 1024,
-	.result_num_bytes        = 21,
+	.result_num_bytes        = 25,
 	.key_num_bytes           = 0,
 	.num_buckets             = 0,
 	.hash_tbl_entries        = 0,
@@ -535,7 +555,8 @@ struct bnxt_ulp_app_capabilities_info ulp_app_cap_info_list[] = {
 	{
 	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.flags                   = 0,
+	.flags                   = BNXT_ULP_APP_CAP_L2_ETYPE,
+	.default_priority        = 0,
 	.vxlan_port              = 4789,
 	.vxlan_ip_port           = 0
 	},
@@ -543,15622 +564,827 @@ struct bnxt_ulp_app_capabilities_info ulp_app_cap_info_list[] = {
 	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.flags                   = 0,
+	.default_priority        = 0,
 	.vxlan_port              = 0,
 	.vxlan_ip_port           = 0
-	},
+	}
+};
+
+/* List of unnamed app tf resources required to be reserved per app/device */
+struct bnxt_ulp_resource_resv_info ulp_app_resource_resv_list[] = {};
+
+/* List of global app tf resources required to be reserved per app/device */
+struct bnxt_ulp_glb_resource_info ulp_app_glb_resource_tbl[] = {};
+
+/* List of global tf resources required to be reserved per app/device */
+struct bnxt_ulp_glb_resource_info ulp_glb_resource_tbl[] = {
 	{
-	.app_id                  = 1,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.flags                   = 0,
-	.vxlan_port              = 0,
-	.vxlan_ip_port           = 0
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.flags                   = BNXT_ULP_APP_CAP_SHARED_EN |
-					BNXT_ULP_APP_CAP_IP_TOS_PROTO_SUPPORT |
-					BNXT_ULP_APP_CAP_SRV6,
-	.vxlan_port              = 0,
-	.vxlan_ip_port           = 0
+	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
+	.direction               = TF_DIR_RX
 	},
 	{
-	.app_id                  = 2,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.flags                   = 0,
-	.vxlan_port              = 0,
-	.vxlan_ip_port           = 0
+	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
+	.direction               = TF_DIR_TX
 	},
 	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.flags                   = BNXT_ULP_APP_CAP_SHARED_EN |
-					BNXT_ULP_APP_CAP_IP_TOS_PROTO_SUPPORT |
-					BNXT_ULP_APP_CAP_SRV6,
-	.vxlan_port              = 0,
-	.vxlan_ip_port           = 0
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
+	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_VF_2_VFR_PROF_FUNC_ID,
+	.direction               = TF_DIR_RX
 	},
 	{
-	.app_id                  = 3,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.flags                   = BNXT_ULP_APP_CAP_UNICAST_ONLY,
-	.vxlan_port              = 0,
-	.vxlan_ip_port           = 0
+	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ANY_2_VF_PROF_FUNC_ID,
+	.direction               = TF_DIR_RX
 	},
 	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.flags                   = BNXT_ULP_APP_CAP_UNICAST_ONLY,
-	.vxlan_port              = 0,
-	.vxlan_ip_port           = 0
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
+	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,
+	.direction               = TF_DIR_TX
 	},
 	{
-	.app_id                  = 4,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.flags                   = BNXT_ULP_APP_CAP_SHARED_EN |
-				   BNXT_ULP_APP_CAP_HOT_UPGRADE_EN |
-				   BNXT_ULP_APP_CAP_UNICAST_ONLY,
-	.vxlan_port              = 0,
-	.vxlan_ip_port           = 0,
-	.upgrade_fw_update       = 0,
-	.ha_pool_id              = 3,
-	.ha_reg_cnt              = 7,
-	.ha_reg_state            = 8
+	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
+	.direction               = TF_DIR_RX
 	},
 	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.flags                   = BNXT_ULP_APP_CAP_SHARED_EN |
-				   BNXT_ULP_APP_CAP_HOT_UPGRADE_EN |
-				   BNXT_ULP_APP_CAP_UNICAST_ONLY |
-				   BNXT_ULP_APP_CAP_SOCKET_DIRECT,
-	.vxlan_port              = 0,
-	.vxlan_ip_port           = 0,
-	.upgrade_fw_update       = 0,
-	.ha_pool_id              = 3,
-	.ha_reg_cnt              = 7,
-	.ha_reg_state            = 8
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
+	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
+	.direction               = TF_DIR_TX
 	},
 	{
-	.app_id                  = 5,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.flags                   = BNXT_ULP_APP_CAP_SHARED_EN |
-				   BNXT_ULP_APP_CAP_HOT_UPGRADE_EN |
-				   BNXT_ULP_APP_CAP_UNICAST_ONLY |
-				   BNXT_ULP_APP_CAP_HA_DYNAMIC,
-	.vxlan_port              = 0,
-	.vxlan_ip_port           = 0,
-	.upgrade_fw_update       = 1,
-	.ha_pool_id              = 4,
-	.ha_reg_cnt              = 9,
-	.ha_reg_state            = 10
+	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_VXLAN_PROF_FUNC_ID,
+	.direction               = TF_DIR_RX
 	},
 	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.flags                   = BNXT_ULP_APP_CAP_SHARED_EN |
-				   BNXT_ULP_APP_CAP_UNICAST_ONLY |
-				   BNXT_ULP_APP_CAP_HOT_UPGRADE_EN |
-				   BNXT_ULP_APP_CAP_SOCKET_DIRECT |
-				   BNXT_ULP_APP_CAP_HA_DYNAMIC,
-	.vxlan_port              = 0,
-	.vxlan_ip_port           = 0,
-	.upgrade_fw_update       = 1,
-	.ha_pool_id              = 4,
-	.ha_reg_cnt              = 9,
-	.ha_reg_state            = 10
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
+	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
+	.direction               = TF_DIR_RX
 	},
 	{
-	.app_id                  = 6,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.flags                   = BNXT_ULP_APP_CAP_UNICAST_ONLY |
-				   BNXT_ULP_APP_CAP_IP_TOS_PROTO_SUPPORT,
-	.vxlan_port              = 0,
-	.vxlan_ip_port           = 0
+	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
+	.direction               = TF_DIR_TX
 	},
 	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.flags                   = BNXT_ULP_APP_CAP_UNICAST_ONLY |
-				   BNXT_ULP_APP_CAP_IP_TOS_PROTO_SUPPORT,
-	.vxlan_port              = 0,
-	.vxlan_ip_port           = 0
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
+	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+	.resource_type           = TF_IDENT_TYPE_EM_PROF,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_0,
+	.direction               = TF_DIR_RX
 	},
 	{
-	.app_id                  = 7,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.flags                   = BNXT_ULP_APP_CAP_UNICAST_ONLY |
-					BNXT_ULP_APP_CAP_IP_TOS_PROTO_SUPPORT |
-					BNXT_ULP_APP_CAP_BC_MC_SUPPORT,
-	.vxlan_port              = 0,
-	.vxlan_ip_port           = 0
+	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+	.resource_type           = TF_IDENT_TYPE_WC_PROF,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0,
+	.direction               = TF_DIR_RX
 	},
 	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.flags                   = BNXT_ULP_APP_CAP_UNICAST_ONLY |
-					BNXT_ULP_APP_CAP_IP_TOS_PROTO_SUPPORT |
-					BNXT_ULP_APP_CAP_BC_MC_SUPPORT,
-	.vxlan_port              = 0,
-	.vxlan_ip_port           = 0
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
+	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+	.resource_type           = TF_IDENT_TYPE_EM_PROF,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_VFR_EM_PROF_ID_0,
+	.direction               = TF_DIR_RX
 	},
 	{
-	.app_id                  = 8,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.flags                   = BNXT_ULP_APP_CAP_UNICAST_ONLY |
-					BNXT_ULP_APP_CAP_SHARED_EN,
-	.vxlan_port              = 0,
-	.vxlan_ip_port           = 0
+	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+	.resource_type           = TF_IDENT_TYPE_EM_PROF,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_VFR_EM_PROF_ID_1,
+	.direction               = TF_DIR_RX
 	},
 	{
-	.app_id                  = 8,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.flags                   = BNXT_ULP_APP_CAP_UNICAST_ONLY |
-					BNXT_ULP_APP_CAP_SHARED_EN,
-	.vxlan_port              = 0,
-	.vxlan_ip_port           = 0
+	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
+	.direction               = TF_DIR_RX
 	},
 	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.flags                   = BNXT_ULP_APP_CAP_UNICAST_ONLY |
-					BNXT_ULP_APP_CAP_SHARED_EN,
-	.vxlan_port              = 0,
-	.vxlan_ip_port           = 0
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
+	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
+	.direction               = TF_DIR_TX
 	},
 	{
-	.app_id                  = 9,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.flags                   = BNXT_ULP_APP_CAP_UNICAST_ONLY |
-					BNXT_ULP_APP_CAP_SHARED_EN,
-	.vxlan_port              = 0,
-	.vxlan_ip_port           = 0
+	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,
+	.direction               = TF_DIR_TX
 	},
 	{
-	.app_id                  = 10,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.flags                   = BNXT_ULP_APP_CAP_UNICAST_ONLY,
-	.vxlan_port              = 0,
-	.vxlan_ip_port           = 250
+	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_DROP_AREC_PTR,
+	.direction               = TF_DIR_RX
 	},
 	{
-	.app_id                  = 11,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.flags                   = BNXT_ULP_APP_CAP_BC_MC_SUPPORT |
-							BNXT_ULP_APP_CAP_IP_TOS_PROTO_SUPPORT
+	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_DROP_AREC_PTR,
+	.direction               = TF_DIR_TX
 	},
 	{
-	.app_id                  = 12,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.flags                   = BNXT_ULP_APP_CAP_UNICAST_ONLY |
-							BNXT_ULP_APP_CAP_SHARED_EN |
-							BNXT_ULP_APP_CAP_HOT_UPGRADE_EN,
-	.vxlan_port              = 0,
-	.vxlan_ip_port           = 0,
-	.upgrade_fw_update       = 0,
-	.ha_pool_id              = 5,
-	.ha_reg_cnt              = 7,
-	.ha_reg_state            = 8
+	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
+	.direction               = TF_DIR_RX
 	},
 	{
-	.app_id                  = 13,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.flags                   = BNXT_ULP_APP_CAP_UNICAST_ONLY |
-							BNXT_ULP_APP_CAP_SHARED_EN |
-							BNXT_ULP_APP_CAP_HOT_UPGRADE_EN,
-	.vxlan_port              = 0,
-	.vxlan_ip_port           = 0,
-	.upgrade_fw_update       = 0,
-	.ha_pool_id              = 5,
-	.ha_reg_cnt              = 7,
-	.ha_reg_state            = 8
+	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
+	.direction               = TF_DIR_TX
 	},
 	{
-	.app_id                  = 14,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.flags                   = BNXT_ULP_APP_CAP_UNICAST_ONLY,
-	.vxlan_port              = 0,
-	.vxlan_ip_port           = 0
-	}
-};
-
-/* List of unnamed app tf resources required to be reserved per app/device */
-struct bnxt_ulp_resource_resv_info ulp_app_resource_resv_list[] = {
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 256
+	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_VXLAN_PROF_FUNC_ID,
+	.direction               = TF_DIR_RX
 	},
 	{
-	.app_id                  = 1,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 1792
+	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GRE_PROF_FUNC_ID,
+	.direction               = TF_DIR_RX
 	},
 	{
-	.app_id                  = 1,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 896
+	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_VF_2_VFR_PROF_FUNC_ID,
+	.direction               = TF_DIR_RX
 	},
 	{
-	.app_id                  = 1,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
-	.count                   = 1792
+	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ANY_2_VF_PROF_FUNC_ID,
+	.direction               = TF_DIR_RX
 	},
 	{
-	.app_id                  = 1,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
-	.count                   = 1024
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 6860
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 256
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 1792
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 896
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
-	.count                   = 1792
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
-	.count                   = 1024
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 7168
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 256
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 7168
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 7168
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
-	.count                   = 1792
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
-	.count                   = 4096
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 6860
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 256
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 7168
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 7168
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
-	.count                   = 1792
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
-	.count                   = 4096
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 7168
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED_OWC,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED_WC,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 64
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED_OWC,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 6520
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED_WC,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 6520
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED_OWC,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED_WC,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 256
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED_OWC,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 6520
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED_WC,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 392
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED_WC,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 2
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED_WC,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED_WC,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 2
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED_WC,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 1024
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED_WC,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 2
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED_WC,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED_WC,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 2
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED_WC,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 1024
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED_WC,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 2
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED_WC,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 6860
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED_OWC,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 6860
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED_WC,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 2
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED_WC,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 704
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED_OWC,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 704
-	}
-};
-
-/* List of global app tf resources required to be reserved per app/device */
-struct bnxt_ulp_glb_resource_info ulp_app_glb_resource_tbl[] = {
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_EM_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_4,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_5,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_6,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_7,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_8,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_9,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_10,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_EM_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_4,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_5,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_6,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_7,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_8,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_9,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_10,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_EM_KEY_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_4,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_EM_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_4,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_5,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_6,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_7,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_8,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_9,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_10,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_EM_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_4,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_5,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_6,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_7,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_8,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_9,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_10,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_EM_KEY_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_4,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_EM_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_EM_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_EM_KEY_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_EM_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_EM_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_EM_KEY_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_EM_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_EM_KEY_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_PROF_FUNC_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_L2_CNTXT_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_PROFILE_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_WC_KEY_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_SHARED,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_APP_GLB_AREC_PTR_1,
-	.direction               = TF_DIR_RX
-	}
-};
-
-/* List of global tf resources required to be reserved per app/device */
-struct bnxt_ulp_glb_resource_info ulp_glb_resource_tbl[] = {
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_VXLAN_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_DROP_AREC_PTR,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_DROP_AREC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_VXLAN_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GRE_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_VF_2_VFR_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ANY_2_VF_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ANY_2_VF_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_MODIFY_8B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_MODIFY_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_4,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_5,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_4,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_0,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_1,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_1,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_1,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_METADATA,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_METADATA_PROF_0,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_VFR_EM_PROF_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_VFR_EM_PROF_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_VFR_EM_KEY_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_VFR_EM_KEY_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_VXLAN_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_DROP_AREC_PTR,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_DROP_AREC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_VXLAN_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GRE_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_VF_2_VFR_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ANY_2_VF_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ANY_2_VF_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_MODIFY_8B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_MODIFY_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_4,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_5,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_4,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_0,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_1,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_1,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_2,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_3,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_1,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_VFR_EM_PROF_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_VFR_EM_PROF_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_VFR_EM_KEY_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_VFR_EM_KEY_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_KEY_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_KEY_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_VXLAN_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_DROP_AREC_PTR,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_DROP_AREC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_VXLAN_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GRE_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_VF_2_VFR_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ANY_2_VF_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ANY_2_VF_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_MODIFY_8B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_MODIFY_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_4,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_5,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_4,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_0,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_1,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_1,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_2,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_3,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_1,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_VFR_EM_PROF_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_VFR_EM_PROF_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_VFR_EM_KEY_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_VFR_EM_KEY_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_KEY_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_KEY_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_VXLAN_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_VXLAN_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GRE_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_4,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_5,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_6,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_7,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_8,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_9,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_4,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_5,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_6,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_7,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_8,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_0,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_1,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_1,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_4,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_5,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_6,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_7,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_8,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_9,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_KEY_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_KEY_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_KEY_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_KEY_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_KEY_ID_4,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_KEY_ID_5,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_VXLAN_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_VXLAN_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_VXLAN_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GRE_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_KEY_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_KEY_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_4,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_5,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_VXLAN_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_VXLAN_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GRE_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_4,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_5,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_4,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_0,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_1,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_1,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_1,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_METADATA,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_METADATA_PROF_0,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_VFR_EM_PROF_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_VFR_EM_KEY_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_VXLAN_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_VXLAN_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GRE_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_0,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_1,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_1,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_2,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_4,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_KEY_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_KEY_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_KEY_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_KEY_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_VXLAN_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_VXLAN_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GRE_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_4,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_0,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_1,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_1,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_2,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_KEY_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_KEY_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_KEY_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_KEY_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_VXLAN_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_VXLAN_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GRE_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_4,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_5,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_4,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_0,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_1,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_1,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_METADATA,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_METADATA_PROF_0,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_VFR_EM_PROF_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_VFR_EM_KEY_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_VXLAN_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_VXLAN_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GRE_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_4,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_5,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_6,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_7,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_4,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_0,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_1,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_1,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_4,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_5,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_6,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_7,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_KEY_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_KEY_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_KEY_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_KEY_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_VXLAN_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GRE_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_4,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_0,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_1,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_1,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_2,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_KEY_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_KEY_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_KEY_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_KEY_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_VXLAN_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_VXLAN_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GRE_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_4,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_5,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_1,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_2,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_3,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_4,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_0,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_1,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_1,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_METADATA,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_METADATA_PROF_0,
-	.direction               = TF_DIR_TX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_VFR_EM_PROF_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_VFR_EM_KEY_ID_0,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 14,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_L2_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	},
-	{
-	.app_id                  = 14,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID,
-	.direction               = TF_DIR_RX
-	}
-};
-
-/* List of tf resources required to be reserved per app/device */
-struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 422
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,
-	.count                   = 6
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 191
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 63
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 192
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 8192
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 6912
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_MODIFY_IPV4,
-	.count                   = 1023
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_8B,
-	.count                   = 511
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.count                   = 15
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC,
-	.count                   = 255
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_MIRROR_CONFIG,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 422
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.count                   = 6
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 960
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 88
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 13168
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_TBL_SCOPE,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 292
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,
-	.count                   = 148
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 191
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 63
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 192
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 8192
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 6912
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_MODIFY_IPV4,
-	.count                   = 1023
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
-	.count                   = 511
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.count                   = 223
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_8B,
-	.count                   = 255
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
-	.count                   = 488
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV6,
-	.count                   = 511
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_MIRROR_CONFIG,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 292
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.count                   = 144
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 960
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 928
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 15232
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_TBL_SCOPE,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 272
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,
-	.count                   = 6
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 8192
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 8192
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_MIRROR_CONFIG,
-	.count                   = 5
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_METER_PROF,
-	.count                   = 256
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_METER_INST,
-	.count                   = 1023
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.count                   = 31
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
-	.count                   = 2048
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
-	.count                   = 64
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 272
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.count                   = 6
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 4096
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 16384
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,
-	.count                   = 272
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 63
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 8192
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 8192
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_MIRROR_CONFIG,
-	.count                   = 5
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
-	.count                   = 2048
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
-	.count                   = 100
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.count                   = 272
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 4096
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 16384
-	},
-	{
-	.app_id                  = 0,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_METADATA,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 422
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,
-	.count                   = 6
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 191
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 63
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 192
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 8192
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 6912
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_MODIFY_IPV4,
-	.count                   = 1023
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_8B,
-	.count                   = 511
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.count                   = 15
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC,
-	.count                   = 255
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_MIRROR_CONFIG,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 422
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.count                   = 6
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 960
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 88
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 13168
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_TBL_SCOPE,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 292
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,
-	.count                   = 148
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 191
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 63
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 192
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 8192
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 6912
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_MODIFY_IPV4,
-	.count                   = 1023
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
-	.count                   = 511
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.count                   = 223
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_8B,
-	.count                   = 255
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
-	.count                   = 488
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV6,
-	.count                   = 511
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_MIRROR_CONFIG,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 292
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.count                   = 144
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 960
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 928
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 15232
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_TBL_SCOPE,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 16
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,
-	.count                   = 2
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 48
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 48
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 512
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 512
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_MIRROR_CONFIG,
-	.count                   = 5
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.count                   = 16
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.count                   = 16
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 16
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.count                   = 2
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 64
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 11264
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,
-	.count                   = 256
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 48
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 24
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 48
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 512
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 512
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_MIRROR_CONFIG,
-	.count                   = 5
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.count                   = 16
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.count                   = 16
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.count                   = 256
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 64
-	},
-	{
-	.app_id                  = 1,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 11264
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 422
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,
-	.count                   = 6
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 191
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 63
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 192
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 8192
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 6912
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_MODIFY_IPV4,
-	.count                   = 1023
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_8B,
-	.count                   = 511
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.count                   = 15
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC,
-	.count                   = 255
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_MIRROR_CONFIG,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 422
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.count                   = 6
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 960
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 88
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 13168
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_TBL_SCOPE,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 292
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,
-	.count                   = 148
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 191
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 63
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 192
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 8192
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 6912
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_MODIFY_IPV4,
-	.count                   = 1023
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
-	.count                   = 511
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.count                   = 223
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_8B,
-	.count                   = 255
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
-	.count                   = 488
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV6,
-	.count                   = 511
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_MIRROR_CONFIG,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 292
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.count                   = 144
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 960
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 928
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 15232
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_TBL_SCOPE,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 256
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 48
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 48
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 512
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 512
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_MIRROR_CONFIG,
-	.count                   = 5
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.count                   = 16
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.count                   = 16
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 256
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 64
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 11264
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,
-	.count                   = 16
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 48
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 24
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 48
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 512
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 512
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_MIRROR_CONFIG,
-	.count                   = 5
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.count                   = 16
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.count                   = 16
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.count                   = 16
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 64
-	},
-	{
-	.app_id                  = 2,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 11264
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 422
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,
-	.count                   = 6
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 191
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 63
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 192
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 8192
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 7168
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_MODIFY_IPV4,
-	.count                   = 1023
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_8B,
-	.count                   = 511
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.count                   = 15
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC,
-	.count                   = 255
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_MIRROR_CONFIG,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 422
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.count                   = 6
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 960
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 88
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 13168
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_TBL_SCOPE,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 292
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,
-	.count                   = 148
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 191
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 63
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 192
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 8192
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 7168
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_MODIFY_IPV4,
-	.count                   = 1023
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
-	.count                   = 511
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.count                   = 223
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_8B,
-	.count                   = 255
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
-	.count                   = 488
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV6,
-	.count                   = 511
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_MIRROR_CONFIG,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 292
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.count                   = 144
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 960
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 928
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 15232
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_TBL_SCOPE,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,
-	.count                   = 6
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 63
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 8192
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 8192
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_MIRROR_CONFIG,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
-	.count                   = 1024
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
-	.count                   = 1024
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_MODIFY_64B,
-	.count                   = 1024
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.count                   = 6
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 7168
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 26624
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,
-	.count                   = 6
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 63
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 4096
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 1024
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_MIRROR_CONFIG,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
-	.count                   = 1024
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
-	.count                   = 1024
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_MODIFY_64B,
-	.count                   = 1024
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.count                   = 6
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 2048
-	},
-	{
-	.app_id                  = 3,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 6144
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 16
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 48
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_MODIFY_IPV4,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_8B,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 1024
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 16
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_MODIFY_IPV4,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_8B,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV6,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 1024
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 16
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 16
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 12
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 3576
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 3576
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 16
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 1024
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 16
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 512
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 256
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 16
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 4,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 1024
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 16
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT_NON_HA,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 2
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT_NON_HA,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 28
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT_NON_HA,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 28
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_MODIFY_IPV4,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_8B,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT_NON_HA,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT_NON_HA,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 64
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT_NON_HA,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 28
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 1024
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 16
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT_NON_HA,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 2
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT_NON_HA,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT_NON_HA,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT_NON_HA,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT_NON_HA,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT_NON_HA,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_MODIFY_IPV4,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_8B,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV6,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT_NON_HA,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT_NON_HA,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 1024
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 16
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT_NON_HA,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 2
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 16
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 12
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 512
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT_NON_HA,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 192
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 512
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT_NON_HA,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 192
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 16
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT_NON_HA,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT_NON_HA,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT_NON_HA,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 1024
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 16
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT_NON_HA,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT_NON_HA,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT_NON_HA,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT_NON_HA,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 512
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 256
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT_NON_HA,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT_NON_HA,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT_NON_HA,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 16
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT_NON_HA,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT_NON_HA,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 2
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 5,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 1024
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,
-	.count                   = 2
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_MODIFY_IPV4,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_8B,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.count                   = 2
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 1024
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,
-	.count                   = 2
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_MODIFY_IPV4,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_8B,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV6,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.count                   = 2
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 1024
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,
-	.count                   = 6
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 63
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 8192
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 8192
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
-	.count                   = 1024
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
-	.count                   = 1024
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.count                   = 6
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 7168
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 26624
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,
-	.count                   = 6
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 63
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 4096
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 1024
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
-	.count                   = 1024
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
-	.count                   = 1024
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.count                   = 6
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 2048
-	},
-	{
-	.app_id                  = 6,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 6144
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 422
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,
-	.count                   = 6
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 191
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 63
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 192
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 8192
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 6912
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_MODIFY_IPV4,
-	.count                   = 1023
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_8B,
-	.count                   = 511
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.count                   = 15
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC,
-	.count                   = 255
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_MIRROR_CONFIG,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 422
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.count                   = 6
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 960
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 88
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 13168
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_TBL_SCOPE,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 292
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,
-	.count                   = 148
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 191
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 63
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 192
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 8192
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 6912
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_MODIFY_IPV4,
-	.count                   = 1023
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
-	.count                   = 511
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.count                   = 223
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_8B,
-	.count                   = 255
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
-	.count                   = 488
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV6,
-	.count                   = 511
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_MIRROR_CONFIG,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 292
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.count                   = 144
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 960
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 928
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 15232
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_TBL_SCOPE,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 272
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,
-	.count                   = 6
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 8192
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 8192
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_MIRROR_CONFIG,
-	.count                   = 5
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.count                   = 31
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
-	.count                   = 2048
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
-	.count                   = 64
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 272
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.count                   = 6
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 4096
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 16384
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,
-	.count                   = 272
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 63
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 8192
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 8192
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_MIRROR_CONFIG,
-	.count                   = 5
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
-	.count                   = 2048
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
-	.count                   = 100
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.count                   = 272
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 4096
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 16384
-	},
-	{
-	.app_id                  = 7,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_METADATA,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,
-	.count                   = 2
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_MODIFY_IPV4,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_8B,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.count                   = 2
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 16
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 1024
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_TBL_SCOPE,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,
-	.count                   = 2
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_MODIFY_IPV4,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_8B,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV6,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.count                   = 2
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 16
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 1024
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_TBL_SCOPE,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,
-	.count                   = 2
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 8
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 1024
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 256
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.count                   = 8
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.count                   = 8
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_MODIFY_64B,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.count                   = 2
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 256
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 1024
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,
-	.count                   = 2
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 8
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 1024
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 256
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_MODIFY_64B,
-	.count                   = 4
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.count                   = 2
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 8,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 1024
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,
-	.count                   = 2
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 16
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 16
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 16
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 4096
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 2048
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_MODIFY_IPV4,
-	.count                   = 512
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_8B,
-	.count                   = 256
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.count                   = 8
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.count                   = 2
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 256
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 588
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 4096
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_TBL_SCOPE,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,
-	.count                   = 2
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 16
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 8
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 16
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 4096
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 2048
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_MODIFY_IPV4,
-	.count                   = 512
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_8B,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV6,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.count                   = 2
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 256
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 4096
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_TBL_SCOPE,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,
-	.count                   = 2
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 8
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 4096
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 4096
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.count                   = 8
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.count                   = 8
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
-	.count                   = 512
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
-	.count                   = 512
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_MODIFY_64B,
-	.count                   = 512
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.count                   = 2
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 64
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 4096
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 6144
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,
-	.count                   = 2
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 8
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 4096
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 1024
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.count                   = 8
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.count                   = 8
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
-	.count                   = 512
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
-	.count                   = 512
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_MODIFY_64B,
-	.count                   = 512
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.count                   = 2
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 64
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 1024
-	},
-	{
-	.app_id                  = 9,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 4096
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 422
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,
-	.count                   = 6
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 191
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 63
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 192
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 8192
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 6912
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_MODIFY_IPV4,
-	.count                   = 1023
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_8B,
-	.count                   = 511
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.count                   = 15
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC,
-	.count                   = 255
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_MIRROR_CONFIG,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 422
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.count                   = 6
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 960
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 88
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 13168
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_TBL_SCOPE,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 292
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,
-	.count                   = 148
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 191
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 63
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 192
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 8192
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 6912
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_MODIFY_IPV4,
-	.count                   = 1023
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
-	.count                   = 511
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.count                   = 223
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_8B,
-	.count                   = 255
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
-	.count                   = 488
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV6,
-	.count                   = 511
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_MIRROR_CONFIG,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 292
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.count                   = 144
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 960
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 928
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 15232
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_TBL_SCOPE,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 272
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,
-	.count                   = 6
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 8192
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 8192
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_MIRROR_CONFIG,
-	.count                   = 5
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.count                   = 31
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
-	.count                   = 2048
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
-	.count                   = 64
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 272
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.count                   = 6
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 4096
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 16384
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,
-	.count                   = 272
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 63
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 8192
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 8192
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_MIRROR_CONFIG,
-	.count                   = 5
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
-	.count                   = 2048
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
-	.count                   = 100
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.count                   = 272
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 4096
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 16384
-	},
-	{
-	.app_id                  = 10,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_METADATA,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 422
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,
-	.count                   = 6
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 191
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 63
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 192
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 8192
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 7168
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_MODIFY_IPV4,
-	.count                   = 1023
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_8B,
-	.count                   = 511
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.count                   = 15
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC,
-	.count                   = 255
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_MIRROR_CONFIG,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 422
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.count                   = 6
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 960
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 88
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 13168
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_TBL_SCOPE,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 292
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,
-	.count                   = 148
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 191
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 63
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 192
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 8192
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 7168
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_MODIFY_IPV4,
-	.count                   = 1023
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
-	.count                   = 511
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.count                   = 223
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_8B,
-	.count                   = 255
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
-	.count                   = 488
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV6,
-	.count                   = 511
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_MIRROR_CONFIG,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 292
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.count                   = 144
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 960
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 928
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 15232
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_TBL_SCOPE,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,
-	.count                   = 6
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 63
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 8192
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 8192
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_MIRROR_CONFIG,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
-	.count                   = 1024
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
-	.count                   = 1024
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_MODIFY_64B,
-	.count                   = 1024
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.count                   = 6
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 7168
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 26624
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,
-	.count                   = 6
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 63
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 4096
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 1024
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_MIRROR_CONFIG,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
-	.count                   = 1024
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
-	.count                   = 1024
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_MODIFY_64B,
-	.count                   = 1024
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.count                   = 6
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 2048
-	},
-	{
-	.app_id                  = 11,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 6144
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,
-	.count                   = 2
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 62
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 8
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 4080
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 4080
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.count                   = 8
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.count                   = 8
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
-	.count                   = 512
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
-	.count                   = 512
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_MODIFY_64B,
-	.count                   = 512
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 128
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.count                   = 2
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 64
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 4096
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,
-	.count                   = 2
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
 	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 8
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 32
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 4096
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 1024
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.count                   = 8
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.count                   = 8
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
-	.count                   = 512
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
-	.count                   = 512
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ANY_2_VF_PROF_FUNC_ID,
+	.direction               = TF_DIR_TX
 	},
 	{
-	.app_id                  = 12,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_MODIFY_64B,
-	.count                   = 512
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.count                   = 2
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 64
-	},
-	{
-	.app_id                  = 12,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 1024
+	.resource_type           = TF_TBL_TYPE_ACT_MODIFY_8B,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_MODIFY_PTR,
+	.direction               = TF_DIR_TX
 	},
 	{
-	.app_id                  = 12,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
-	.direction               = TF_DIR_TX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 4096
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 422
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,
-	.count                   = 6
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 191
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 63
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 192
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 8192
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 6912
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_MODIFY_IPV4,
-	.count                   = 1023
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_8B,
-	.count                   = 511
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
 	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.count                   = 15
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC,
-	.count                   = 255
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_MIRROR_CONFIG,
-	.count                   = 1
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 422
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.count                   = 6
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 960
-	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
-	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 88
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
+	.direction               = TF_DIR_RX
 	},
-	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
+	{
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 13168
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
+	.direction               = TF_DIR_TX
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_RX,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_TBL_SCOPE,
-	.count                   = 1
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+	.resource_type           = TF_IDENT_TYPE_EM_PROF,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_EM_PROFILE_ID_0,
+	.direction               = TF_DIR_RX
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 292
+	.resource_type           = TF_IDENT_TYPE_WC_PROF,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0,
+	.direction               = TF_DIR_RX
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,
-	.count                   = 148
+	.resource_type           = TF_IDENT_TYPE_WC_PROF,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_1,
+	.direction               = TF_DIR_RX
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
 	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 191
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_2,
+	.direction               = TF_DIR_RX
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 63
+	.resource_type           = TF_IDENT_TYPE_WC_PROF,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_3,
+	.direction               = TF_DIR_RX
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
-	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 192
+	.resource_type           = TF_IDENT_TYPE_WC_PROF,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_4,
+	.direction               = TF_DIR_RX
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 8192
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+	.resource_type           = TF_IDENT_TYPE_WC_PROF,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_5,
+	.direction               = TF_DIR_RX
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 6912
+	.resource_type           = TF_TBL_TYPE_WC_FKB,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_0,
+	.direction               = TF_DIR_RX
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_MODIFY_IPV4,
-	.count                   = 1023
+	.resource_type           = TF_TBL_TYPE_WC_FKB,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_1,
+	.direction               = TF_DIR_RX
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
-	.count                   = 511
+	.resource_type           = TF_TBL_TYPE_WC_FKB,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_2,
+	.direction               = TF_DIR_RX
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.count                   = 223
+	.resource_type           = TF_TBL_TYPE_WC_FKB,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_3,
+	.direction               = TF_DIR_RX
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_8B,
-	.count                   = 255
+	.resource_type           = TF_TBL_TYPE_WC_FKB,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_4,
+	.direction               = TF_DIR_RX
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
-	.count                   = 488
+	.resource_type           = TF_TBL_TYPE_WC_FKB,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_0,
+	.direction               = TF_DIR_TX
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV6,
-	.count                   = 511
+	.resource_type           = TF_TBL_TYPE_WC_FKB,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_1,
+	.direction               = TF_DIR_TX
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_MIRROR_CONFIG,
-	.count                   = 1
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+	.resource_type           = TF_IDENT_TYPE_WC_PROF,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_0,
+	.direction               = TF_DIR_TX
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 292
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+	.resource_type           = TF_IDENT_TYPE_WC_PROF,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_PROFILE_ID_1,
+	.direction               = TF_DIR_TX
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.count                   = 144
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type           = TF_TBL_TYPE_WC_FKB,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_WC_KEY_ID_1,
+	.direction               = TF_DIR_TX
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 960
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type           = TF_TBL_TYPE_METADATA,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_METADATA_PROF_0,
+	.direction               = TF_DIR_TX
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 928
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+	.resource_type           = TF_IDENT_TYPE_EM_PROF,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_VFR_EM_PROF_ID_0,
+	.direction               = TF_DIR_RX
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 15232
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+	.resource_type           = TF_IDENT_TYPE_EM_PROF,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_VFR_EM_PROF_ID_1,
+	.direction               = TF_DIR_RX
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.direction               = TF_DIR_TX,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
-	.resource_type           = TF_EM_TBL_TYPE_TBL_SCOPE,
-	.count                   = 1
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type           = TF_TBL_TYPE_EM_FKB,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_VFR_EM_KEY_ID_0,
+	.direction               = TF_DIR_RX
 	},
 	{
-	.app_id                  = 13,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
+	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type           = TF_TBL_TYPE_EM_FKB,
+	.glb_regfile_index       = BNXT_ULP_GLB_RF_IDX_GLB_VFR_EM_KEY_ID_1,
+	.direction               = TF_DIR_RX
+	}
+};
+
+/* List of tf resources required to be reserved per app/device */
+struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
+	{
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
 	.direction               = TF_DIR_RX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
 	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
-	.count                   = 64
+	.count                   = 422
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
 	.direction               = TF_DIR_RX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
 	.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,
-	.count                   = 2
+	.count                   = 6
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
 	.direction               = TF_DIR_RX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
 	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 16
+	.count                   = 191
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
 	.direction               = TF_DIR_RX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
 	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 16
+	.count                   = 63
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
 	.direction               = TF_DIR_RX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
 	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 16
+	.count                   = 192
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
 	.direction               = TF_DIR_RX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
 	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 1024
+	.count                   = 8192
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
 	.direction               = TF_DIR_RX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
 	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 1024
+	.count                   = 6912
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
 	.direction               = TF_DIR_RX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_MIRROR_CONFIG,
-	.count                   = 5
+	.resource_type           = TF_TBL_TYPE_ACT_MODIFY_IPV4,
+	.count                   = 1023
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
 	.direction               = TF_DIR_RX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.count                   = 8
+	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_8B,
+	.count                   = 511
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
 	.direction               = TF_DIR_RX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.count                   = 8
+	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
+	.count                   = 15
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
 	.direction               = TF_DIR_RX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
-	.count                   = 1000
+	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC,
+	.count                   = 255
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
 	.direction               = TF_DIR_RX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
-	.count                   = 64
+	.resource_type           = TF_TBL_TYPE_MIRROR_CONFIG,
+	.count                   = 1
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
 	.direction               = TF_DIR_RX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
 	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.count                   = 64
+	.count                   = 422
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
 	.direction               = TF_DIR_RX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
 	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.count                   = 2
+	.count                   = 6
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
 	.direction               = TF_DIR_RX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
 	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 32
+	.count                   = 960
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
+	.direction               = TF_DIR_RX,
+	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
+	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
+	.count                   = 88
+	},
+	{
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
 	.direction               = TF_DIR_RX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
 	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 8192
+	.count                   = 13168
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
+	.direction               = TF_DIR_RX,
+	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
+	.resource_type           = TF_EM_TBL_TYPE_TBL_SCOPE,
+	.count                   = 1
+	},
+	{
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
+	.direction               = TF_DIR_TX,
+	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+	.resource_type           = TF_IDENT_TYPE_L2_CTXT_HIGH,
+	.count                   = 292
+	},
+	{
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
 	.direction               = TF_DIR_TX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
 	.resource_type           = TF_IDENT_TYPE_L2_CTXT_LOW,
-	.count                   = 64
+	.count                   = 148
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
 	.direction               = TF_DIR_TX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
 	.resource_type           = TF_IDENT_TYPE_WC_PROF,
-	.count                   = 16
+	.count                   = 191
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
 	.direction               = TF_DIR_TX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
 	.resource_type           = TF_IDENT_TYPE_PROF_FUNC,
-	.count                   = 16
+	.count                   = 63
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
 	.direction               = TF_DIR_TX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
 	.resource_type           = TF_IDENT_TYPE_EM_PROF,
-	.count                   = 16
+	.count                   = 192
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
 	.direction               = TF_DIR_TX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
 	.resource_type           = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.count                   = 2048
+	.count                   = 8192
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
 	.direction               = TF_DIR_TX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
 	.resource_type           = TF_TBL_TYPE_ACT_STATS_64,
-	.count                   = 2048
+	.count                   = 6912
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
 	.direction               = TF_DIR_TX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_MIRROR_CONFIG,
-	.count                   = 5
+	.resource_type           = TF_TBL_TYPE_ACT_MODIFY_IPV4,
+	.count                   = 1023
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
 	.direction               = TF_DIR_TX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_EM_FKB,
-	.count                   = 8
+	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
+	.count                   = 511
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
 	.direction               = TF_DIR_TX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_WC_FKB,
-	.count                   = 8
+	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_16B,
+	.count                   = 223
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
 	.direction               = TF_DIR_TX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
-	.count                   = 1000
+	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_8B,
+	.count                   = 255
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
 	.direction               = TF_DIR_TX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
 	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
-	.count                   = 100
+	.count                   = 488
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
+	.direction               = TF_DIR_TX,
+	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV6,
+	.count                   = 512
+	},
+	{
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
+	.direction               = TF_DIR_TX,
+	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type           = TF_TBL_TYPE_MIRROR_CONFIG,
+	.count                   = 1
+	},
+	{
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
+	.direction               = TF_DIR_TX,
+	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
+	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
+	.count                   = 292
+	},
+	{
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
 	.direction               = TF_DIR_TX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
 	.resource_type           = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.count                   = 64
+	.count                   = 144
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
 	.direction               = TF_DIR_TX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
 	.resource_type           = TF_TCAM_TBL_TYPE_PROF_TCAM,
-	.count                   = 32
+	.count                   = 960
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
 	.direction               = TF_DIR_TX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
 	.resource_type           = TF_TCAM_TBL_TYPE_WC_TCAM,
-	.count                   = 2032
+	.count                   = 928
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
 	.direction               = TF_DIR_TX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
 	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
 	.resource_type           = TF_EM_TBL_TYPE_EM_RECORD,
-	.count                   = 8192
+	.count                   = 15232
 	},
 	{
-	.app_id                  = 13,
-	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_WH_PLUS,
 	.direction               = TF_DIR_TX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
-	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type           = TF_TBL_TYPE_METADATA,
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
+	.resource_type           = TF_EM_TBL_TYPE_TBL_SCOPE,
 	.count                   = 1
 	},
 	{
-	.app_id                  = 14,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.direction               = TF_DIR_RX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
@@ -16167,7 +1393,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
 	.count                   = 272
 	},
 	{
-	.app_id                  = 14,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.direction               = TF_DIR_RX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
@@ -16176,7 +1402,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
 	.count                   = 6
 	},
 	{
-	.app_id                  = 14,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.direction               = TF_DIR_RX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
@@ -16185,7 +1411,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
 	.count                   = 32
 	},
 	{
-	.app_id                  = 14,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.direction               = TF_DIR_RX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
@@ -16194,7 +1420,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
 	.count                   = 32
 	},
 	{
-	.app_id                  = 14,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.direction               = TF_DIR_RX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
@@ -16203,7 +1429,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
 	.count                   = 32
 	},
 	{
-	.app_id                  = 14,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.direction               = TF_DIR_RX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
@@ -16212,7 +1438,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
 	.count                   = 8192
 	},
 	{
-	.app_id                  = 14,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.direction               = TF_DIR_RX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
@@ -16221,7 +1447,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
 	.count                   = 8192
 	},
 	{
-	.app_id                  = 14,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.direction               = TF_DIR_RX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
@@ -16230,7 +1456,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
 	.count                   = 5
 	},
 	{
-	.app_id                  = 14,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.direction               = TF_DIR_RX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
@@ -16239,7 +1465,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
 	.count                   = 256
 	},
 	{
-	.app_id                  = 14,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.direction               = TF_DIR_RX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
@@ -16248,7 +1474,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
 	.count                   = 1023
 	},
 	{
-	.app_id                  = 14,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.direction               = TF_DIR_RX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
@@ -16257,7 +1483,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
 	.count                   = 32
 	},
 	{
-	.app_id                  = 14,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.direction               = TF_DIR_RX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
@@ -16266,7 +1492,25 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
 	.count                   = 31
 	},
 	{
-	.app_id                  = 14,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
+	.direction               = TF_DIR_RX,
+	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
+	.count                   = 2048
+	},
+	{
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
+	.direction               = TF_DIR_RX,
+	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
+	.count                   = 64
+	},
+	{
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.direction               = TF_DIR_RX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
@@ -16275,7 +1519,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
 	.count                   = 272
 	},
 	{
-	.app_id                  = 14,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.direction               = TF_DIR_RX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
@@ -16284,7 +1528,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
 	.count                   = 6
 	},
 	{
-	.app_id                  = 14,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.direction               = TF_DIR_RX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
@@ -16293,7 +1537,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
 	.count                   = 128
 	},
 	{
-	.app_id                  = 14,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.direction               = TF_DIR_RX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
@@ -16302,7 +1546,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
 	.count                   = 4096
 	},
 	{
-	.app_id                  = 14,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.direction               = TF_DIR_RX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
@@ -16311,7 +1555,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
 	.count                   = 16384
 	},
 	{
-	.app_id                  = 14,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.direction               = TF_DIR_TX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
@@ -16320,7 +1564,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
 	.count                   = 272
 	},
 	{
-	.app_id                  = 14,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.direction               = TF_DIR_TX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
@@ -16329,7 +1573,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
 	.count                   = 32
 	},
 	{
-	.app_id                  = 14,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.direction               = TF_DIR_TX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
@@ -16338,7 +1582,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
 	.count                   = 63
 	},
 	{
-	.app_id                  = 14,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.direction               = TF_DIR_TX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
@@ -16347,7 +1591,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
 	.count                   = 32
 	},
 	{
-	.app_id                  = 14,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.direction               = TF_DIR_TX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
@@ -16356,7 +1600,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
 	.count                   = 8192
 	},
 	{
-	.app_id                  = 14,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.direction               = TF_DIR_TX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
@@ -16365,7 +1609,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
 	.count                   = 8192
 	},
 	{
-	.app_id                  = 14,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.direction               = TF_DIR_TX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
@@ -16374,7 +1618,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
 	.count                   = 5
 	},
 	{
-	.app_id                  = 14,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.direction               = TF_DIR_TX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
@@ -16383,7 +1627,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
 	.count                   = 32
 	},
 	{
-	.app_id                  = 14,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.direction               = TF_DIR_TX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
@@ -16392,7 +1636,25 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
 	.count                   = 32
 	},
 	{
-	.app_id                  = 14,
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
+	.direction               = TF_DIR_TX,
+	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type           = TF_TBL_TYPE_ACT_ENCAP_64B,
+	.count                   = 2048
+	},
+	{
+	.app_id                  = 0,
+	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
+	.direction               = TF_DIR_TX,
+	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
+	.resource_func           = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type           = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
+	.count                   = 100
+	},
+	{
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.direction               = TF_DIR_TX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
@@ -16401,7 +1663,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
 	.count                   = 272
 	},
 	{
-	.app_id                  = 14,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.direction               = TF_DIR_TX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
@@ -16410,7 +1672,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
 	.count                   = 128
 	},
 	{
-	.app_id                  = 14,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.direction               = TF_DIR_TX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
@@ -16419,7 +1681,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
 	.count                   = 4096
 	},
 	{
-	.app_id                  = 14,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.direction               = TF_DIR_TX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
@@ -16428,7 +1690,7 @@ struct bnxt_ulp_resource_resv_info ulp_resource_resv_list[] = {
 	.count                   = 16384
 	},
 	{
-	.app_id                  = 14,
+	.app_id                  = 0,
 	.device_id               = BNXT_ULP_DEVICE_ID_THOR,
 	.direction               = TF_DIR_TX,
 	.session_type            = BNXT_ULP_SESSION_TYPE_DEFAULT,
@@ -16580,267 +1842,6 @@ uint32_t ulp_act_prop_map_table[] = {
 };
 
 uint8_t ulp_glb_field_tbl[] = {
-	[4096] = 0,
-	[4097] = 1,
-	[4102] = 2,
-	[4104] = 3,
-	[4106] = 4,
-	[4140] = 5,
-	[4142] = 6,
-	[4144] = 7,
-	[4146] = 8,
-	[4148] = 9,
-	[4150] = 10,
-	[4152] = 11,
-	[4154] = 12,
-	[4224] = 0,
-	[4225] = 1,
-	[4230] = 2,
-	[4232] = 3,
-	[4234] = 4,
-	[4248] = 5,
-	[4250] = 6,
-	[4252] = 7,
-	[4254] = 8,
-	[4256] = 9,
-	[4258] = 10,
-	[4260] = 11,
-	[4262] = 12,
-	[4264] = 13,
-	[4266] = 14,
-	[4352] = 0,
-	[4353] = 1,
-	[4358] = 2,
-	[4360] = 3,
-	[4362] = 4,
-	[4396] = 8,
-	[4398] = 9,
-	[4400] = 10,
-	[4402] = 11,
-	[4404] = 12,
-	[4406] = 13,
-	[4408] = 14,
-	[4410] = 15,
-	[4452] = 5,
-	[4456] = 6,
-	[4460] = 7,
-	[4480] = 0,
-	[4481] = 1,
-	[4486] = 2,
-	[4488] = 3,
-	[4490] = 4,
-	[4504] = 8,
-	[4506] = 9,
-	[4508] = 10,
-	[4510] = 11,
-	[4512] = 12,
-	[4514] = 13,
-	[4516] = 14,
-	[4518] = 15,
-	[4520] = 16,
-	[4522] = 17,
-	[4580] = 5,
-	[4584] = 6,
-	[4588] = 7,
-	[4608] = 0,
-	[4609] = 1,
-	[4614] = 2,
-	[4616] = 3,
-	[4618] = 4,
-	[4652] = 5,
-	[4654] = 6,
-	[4656] = 7,
-	[4658] = 8,
-	[4660] = 9,
-	[4662] = 10,
-	[4664] = 11,
-	[4666] = 12,
-	[4682] = 13,
-	[4684] = 14,
-	[4686] = 15,
-	[4688] = 16,
-	[4690] = 17,
-	[4692] = 18,
-	[4694] = 19,
-	[4696] = 20,
-	[4698] = 21,
-	[4736] = 0,
-	[4737] = 1,
-	[4742] = 2,
-	[4744] = 3,
-	[4746] = 4,
-	[4760] = 5,
-	[4762] = 6,
-	[4764] = 7,
-	[4766] = 8,
-	[4768] = 9,
-	[4770] = 10,
-	[4772] = 11,
-	[4774] = 12,
-	[4776] = 13,
-	[4778] = 14,
-	[4810] = 15,
-	[4812] = 16,
-	[4814] = 17,
-	[4816] = 18,
-	[4818] = 19,
-	[4820] = 20,
-	[4822] = 21,
-	[4824] = 22,
-	[4826] = 23,
-	[4864] = 0,
-	[4865] = 1,
-	[4870] = 2,
-	[4872] = 3,
-	[4874] = 4,
-	[4908] = 5,
-	[4910] = 6,
-	[4912] = 7,
-	[4914] = 8,
-	[4916] = 9,
-	[4918] = 10,
-	[4920] = 11,
-	[4922] = 12,
-	[4956] = 13,
-	[4958] = 14,
-	[4960] = 15,
-	[4962] = 16,
-	[4992] = 0,
-	[4993] = 1,
-	[4998] = 2,
-	[5000] = 3,
-	[5002] = 4,
-	[5016] = 5,
-	[5018] = 6,
-	[5020] = 7,
-	[5022] = 8,
-	[5024] = 9,
-	[5026] = 10,
-	[5028] = 11,
-	[5030] = 12,
-	[5032] = 13,
-	[5034] = 14,
-	[5084] = 15,
-	[5086] = 16,
-	[5088] = 17,
-	[5090] = 18,
-	[5120] = 0,
-	[5121] = 1,
-	[5126] = 2,
-	[5128] = 3,
-	[5130] = 4,
-	[5164] = 8,
-	[5166] = 9,
-	[5168] = 10,
-	[5170] = 11,
-	[5172] = 12,
-	[5174] = 13,
-	[5176] = 14,
-	[5178] = 15,
-	[5194] = 16,
-	[5196] = 17,
-	[5198] = 18,
-	[5200] = 19,
-	[5202] = 20,
-	[5204] = 21,
-	[5206] = 22,
-	[5208] = 23,
-	[5210] = 24,
-	[5220] = 5,
-	[5224] = 6,
-	[5228] = 7,
-	[5248] = 0,
-	[5249] = 1,
-	[5254] = 2,
-	[5256] = 3,
-	[5258] = 4,
-	[5272] = 8,
-	[5274] = 9,
-	[5276] = 10,
-	[5278] = 11,
-	[5280] = 12,
-	[5282] = 13,
-	[5284] = 14,
-	[5286] = 15,
-	[5288] = 16,
-	[5290] = 17,
-	[5322] = 18,
-	[5324] = 19,
-	[5326] = 20,
-	[5328] = 21,
-	[5330] = 22,
-	[5332] = 23,
-	[5334] = 24,
-	[5336] = 25,
-	[5338] = 26,
-	[5348] = 5,
-	[5352] = 6,
-	[5356] = 7,
-	[5376] = 0,
-	[5377] = 1,
-	[5382] = 2,
-	[5384] = 3,
-	[5386] = 4,
-	[5420] = 8,
-	[5422] = 9,
-	[5424] = 10,
-	[5426] = 11,
-	[5428] = 12,
-	[5430] = 13,
-	[5432] = 14,
-	[5434] = 15,
-	[5468] = 16,
-	[5470] = 17,
-	[5472] = 18,
-	[5474] = 19,
-	[5476] = 5,
-	[5480] = 6,
-	[5484] = 7,
-	[5504] = 0,
-	[5505] = 1,
-	[5510] = 2,
-	[5512] = 3,
-	[5514] = 4,
-	[5528] = 8,
-	[5530] = 9,
-	[5532] = 10,
-	[5534] = 11,
-	[5536] = 12,
-	[5538] = 13,
-	[5540] = 14,
-	[5542] = 15,
-	[5544] = 16,
-	[5546] = 17,
-	[5596] = 18,
-	[5598] = 19,
-	[5600] = 20,
-	[5602] = 21,
-	[5604] = 5,
-	[5608] = 6,
-	[5612] = 7,
-	[5632] = 0,
-	[5633] = 1,
-	[5638] = 2,
-	[5640] = 3,
-	[5642] = 4,
-	[5656] = 5,
-	[5658] = 6,
-	[5660] = 7,
-	[5662] = 8,
-	[5664] = 9,
-	[5666] = 10,
-	[5668] = 11,
-	[5670] = 12,
-	[5672] = 13,
-	[5674] = 14,
-	[5724] = 15,
-	[5726] = 16,
-	[5728] = 17,
-	[5730] = 18,
-	[5744] = 19,
-	[5745] = 20,
-	[5746] = 21,
-	[5747] = 22,
 	[8192] = 0,
 	[8193] = 1,
 	[8198] = 2,
@@ -16854,14 +1855,6 @@ uint8_t ulp_glb_field_tbl[] = {
 	[8246] = 10,
 	[8248] = 11,
 	[8250] = 12,
-	[8284] = 13,
-	[8286] = 14,
-	[8288] = 15,
-	[8290] = 16,
-	[8304] = 17,
-	[8305] = 18,
-	[8306] = 19,
-	[8307] = 20,
 	[8320] = 0,
 	[8321] = 1,
 	[8326] = 2,
@@ -16877,748 +1870,1021 @@ uint8_t ulp_glb_field_tbl[] = {
 	[8358] = 12,
 	[8360] = 13,
 	[8362] = 14,
-	[8412] = 15,
-	[8414] = 16,
-	[8416] = 17,
-	[8418] = 18,
-	[8432] = 19,
-	[8433] = 20,
-	[8434] = 21,
-	[8435] = 22,
 	[8448] = 0,
 	[8449] = 1,
-	[8455] = 18,
-	[8457] = 19,
-	[8459] = 20,
-	[8492] = 2,
-	[8493] = 21,
-	[8494] = 3,
-	[8495] = 22,
-	[8496] = 4,
-	[8497] = 23,
-	[8498] = 5,
-	[8499] = 24,
-	[8500] = 6,
-	[8501] = 25,
-	[8502] = 7,
-	[8503] = 26,
-	[8504] = 8,
-	[8505] = 27,
-	[8506] = 9,
-	[8507] = 28,
-	[8540] = 10,
-	[8542] = 11,
-	[8544] = 12,
-	[8546] = 13,
-	[8560] = 14,
-	[8561] = 15,
-	[8562] = 16,
-	[8563] = 17,
+	[8454] = 2,
+	[8456] = 3,
+	[8458] = 4,
+	[8492] = 8,
+	[8494] = 9,
+	[8496] = 10,
+	[8498] = 11,
+	[8500] = 12,
+	[8502] = 13,
+	[8504] = 14,
+	[8506] = 15,
+	[8548] = 5,
+	[8552] = 6,
+	[8556] = 7,
 	[8576] = 0,
 	[8577] = 1,
-	[8583] = 20,
-	[8585] = 21,
-	[8587] = 22,
-	[8600] = 2,
-	[8602] = 3,
-	[8604] = 4,
-	[8606] = 5,
-	[8608] = 6,
-	[8610] = 7,
-	[8612] = 8,
-	[8614] = 9,
-	[8616] = 10,
-	[8618] = 11,
-	[8621] = 23,
-	[8623] = 24,
-	[8625] = 25,
-	[8627] = 26,
-	[8629] = 27,
-	[8631] = 28,
-	[8633] = 29,
-	[8635] = 30,
-	[8668] = 12,
-	[8670] = 13,
-	[8672] = 14,
-	[8674] = 15,
-	[8688] = 16,
-	[8689] = 17,
-	[8690] = 18,
-	[8691] = 19,
+	[8582] = 2,
+	[8584] = 3,
+	[8586] = 4,
+	[8600] = 8,
+	[8602] = 9,
+	[8604] = 10,
+	[8606] = 11,
+	[8608] = 12,
+	[8610] = 13,
+	[8612] = 14,
+	[8614] = 15,
+	[8616] = 16,
+	[8618] = 17,
+	[8676] = 5,
+	[8680] = 6,
+	[8684] = 7,
 	[8704] = 0,
 	[8705] = 1,
-	[8711] = 18,
-	[8713] = 19,
-	[8715] = 20,
-	[8729] = 21,
-	[8731] = 22,
-	[8733] = 23,
-	[8735] = 24,
-	[8737] = 25,
-	[8739] = 26,
-	[8741] = 27,
-	[8743] = 28,
-	[8745] = 29,
-	[8747] = 30,
-	[8748] = 2,
-	[8750] = 3,
-	[8752] = 4,
-	[8754] = 5,
-	[8756] = 6,
-	[8758] = 7,
-	[8760] = 8,
-	[8762] = 9,
-	[8796] = 10,
-	[8798] = 11,
-	[8800] = 12,
-	[8802] = 13,
-	[8816] = 14,
-	[8817] = 15,
-	[8818] = 16,
-	[8819] = 17,
+	[8710] = 2,
+	[8712] = 3,
+	[8714] = 4,
+	[8748] = 5,
+	[8750] = 6,
+	[8752] = 7,
+	[8754] = 8,
+	[8756] = 9,
+	[8758] = 10,
+	[8760] = 11,
+	[8762] = 12,
+	[8778] = 13,
+	[8780] = 14,
+	[8782] = 15,
+	[8784] = 16,
+	[8786] = 17,
+	[8788] = 18,
+	[8790] = 19,
+	[8792] = 20,
+	[8794] = 21,
 	[8832] = 0,
 	[8833] = 1,
-	[8839] = 20,
-	[8841] = 21,
-	[8843] = 22,
-	[8856] = 2,
-	[8857] = 23,
-	[8858] = 3,
-	[8859] = 24,
-	[8860] = 4,
-	[8861] = 25,
-	[8862] = 5,
-	[8863] = 26,
-	[8864] = 6,
-	[8865] = 27,
-	[8866] = 7,
-	[8867] = 28,
-	[8868] = 8,
-	[8869] = 29,
-	[8870] = 9,
-	[8871] = 30,
-	[8872] = 10,
-	[8873] = 31,
-	[8874] = 11,
-	[8875] = 32,
-	[8924] = 12,
-	[8926] = 13,
-	[8928] = 14,
-	[8930] = 15,
-	[8944] = 16,
-	[8945] = 17,
-	[8946] = 18,
-	[8947] = 19,
+	[8838] = 2,
+	[8840] = 3,
+	[8842] = 4,
+	[8856] = 5,
+	[8858] = 6,
+	[8860] = 7,
+	[8862] = 8,
+	[8864] = 9,
+	[8866] = 10,
+	[8868] = 11,
+	[8870] = 12,
+	[8872] = 13,
+	[8874] = 14,
+	[8906] = 15,
+	[8908] = 16,
+	[8910] = 17,
+	[8912] = 18,
+	[8914] = 19,
+	[8916] = 20,
+	[8918] = 21,
+	[8920] = 22,
+	[8922] = 23,
 	[8960] = 0,
 	[8961] = 1,
-	[8967] = 18,
-	[8969] = 19,
-	[8971] = 20,
-	[9004] = 2,
-	[9005] = 21,
-	[9006] = 3,
-	[9007] = 22,
-	[9008] = 4,
-	[9009] = 23,
-	[9010] = 5,
-	[9011] = 24,
-	[9012] = 6,
-	[9013] = 25,
-	[9014] = 7,
-	[9015] = 26,
-	[9016] = 8,
-	[9017] = 27,
-	[9018] = 9,
-	[9019] = 28,
-	[9035] = 29,
-	[9037] = 30,
-	[9039] = 31,
-	[9041] = 32,
-	[9043] = 33,
-	[9045] = 34,
-	[9047] = 35,
-	[9049] = 36,
-	[9051] = 37,
-	[9052] = 10,
-	[9054] = 11,
-	[9056] = 12,
-	[9058] = 13,
-	[9072] = 14,
-	[9073] = 15,
-	[9074] = 16,
-	[9075] = 17,
+	[8966] = 2,
+	[8968] = 3,
+	[8970] = 4,
+	[9004] = 5,
+	[9006] = 6,
+	[9008] = 7,
+	[9010] = 8,
+	[9012] = 9,
+	[9014] = 10,
+	[9016] = 11,
+	[9018] = 12,
+	[9052] = 13,
+	[9054] = 14,
+	[9056] = 15,
+	[9058] = 16,
 	[9088] = 0,
 	[9089] = 1,
-	[9095] = 20,
-	[9097] = 21,
-	[9099] = 22,
-	[9112] = 2,
-	[9114] = 3,
-	[9116] = 4,
-	[9118] = 5,
-	[9120] = 6,
-	[9122] = 7,
-	[9124] = 8,
-	[9126] = 9,
-	[9128] = 10,
-	[9130] = 11,
-	[9133] = 23,
-	[9135] = 24,
-	[9137] = 25,
-	[9139] = 26,
-	[9141] = 27,
-	[9143] = 28,
-	[9145] = 29,
-	[9147] = 30,
-	[9163] = 31,
-	[9165] = 32,
-	[9167] = 33,
-	[9169] = 34,
-	[9171] = 35,
-	[9173] = 36,
-	[9175] = 37,
-	[9177] = 38,
-	[9179] = 39,
-	[9180] = 12,
-	[9182] = 13,
-	[9184] = 14,
-	[9186] = 15,
-	[9200] = 16,
-	[9201] = 17,
-	[9202] = 18,
-	[9203] = 19,
+	[9094] = 2,
+	[9096] = 3,
+	[9098] = 4,
+	[9112] = 5,
+	[9114] = 6,
+	[9116] = 7,
+	[9118] = 8,
+	[9120] = 9,
+	[9122] = 10,
+	[9124] = 11,
+	[9126] = 12,
+	[9128] = 13,
+	[9130] = 14,
+	[9180] = 15,
+	[9182] = 16,
+	[9184] = 17,
+	[9186] = 18,
 	[9216] = 0,
 	[9217] = 1,
-	[9223] = 18,
-	[9225] = 19,
-	[9227] = 20,
-	[9241] = 21,
-	[9243] = 22,
-	[9245] = 23,
-	[9247] = 24,
-	[9249] = 25,
-	[9251] = 26,
-	[9253] = 27,
-	[9255] = 28,
-	[9257] = 29,
-	[9259] = 30,
-	[9260] = 2,
-	[9262] = 3,
-	[9264] = 4,
-	[9266] = 5,
-	[9268] = 6,
-	[9270] = 7,
-	[9272] = 8,
-	[9274] = 9,
-	[9291] = 31,
-	[9293] = 32,
-	[9295] = 33,
-	[9297] = 34,
-	[9299] = 35,
-	[9301] = 36,
-	[9303] = 37,
-	[9305] = 38,
-	[9307] = 39,
-	[9308] = 10,
-	[9310] = 11,
-	[9312] = 12,
-	[9314] = 13,
-	[9328] = 14,
-	[9329] = 15,
-	[9330] = 16,
-	[9331] = 17,
+	[9222] = 2,
+	[9224] = 3,
+	[9226] = 4,
+	[9260] = 8,
+	[9262] = 9,
+	[9264] = 10,
+	[9266] = 11,
+	[9268] = 12,
+	[9270] = 13,
+	[9272] = 14,
+	[9274] = 15,
+	[9290] = 16,
+	[9292] = 17,
+	[9294] = 18,
+	[9296] = 19,
+	[9298] = 20,
+	[9300] = 21,
+	[9302] = 22,
+	[9304] = 23,
+	[9306] = 24,
+	[9316] = 5,
+	[9320] = 6,
+	[9324] = 7,
 	[9344] = 0,
 	[9345] = 1,
-	[9351] = 20,
-	[9353] = 21,
-	[9355] = 22,
-	[9368] = 2,
-	[9369] = 23,
-	[9370] = 3,
-	[9371] = 24,
-	[9372] = 4,
-	[9373] = 25,
-	[9374] = 5,
-	[9375] = 26,
-	[9376] = 6,
-	[9377] = 27,
-	[9378] = 7,
-	[9379] = 28,
-	[9380] = 8,
-	[9381] = 29,
-	[9382] = 9,
-	[9383] = 30,
-	[9384] = 10,
-	[9385] = 31,
-	[9386] = 11,
-	[9387] = 32,
-	[9419] = 33,
-	[9421] = 34,
-	[9423] = 35,
-	[9425] = 36,
-	[9427] = 37,
-	[9429] = 38,
-	[9431] = 39,
-	[9433] = 40,
-	[9435] = 41,
-	[9436] = 12,
-	[9438] = 13,
-	[9440] = 14,
-	[9442] = 15,
-	[9456] = 16,
-	[9457] = 17,
-	[9458] = 18,
-	[9459] = 19,
+	[9350] = 2,
+	[9352] = 3,
+	[9354] = 4,
+	[9368] = 8,
+	[9370] = 9,
+	[9372] = 10,
+	[9374] = 11,
+	[9376] = 12,
+	[9378] = 13,
+	[9380] = 14,
+	[9382] = 15,
+	[9384] = 16,
+	[9386] = 17,
+	[9418] = 18,
+	[9420] = 19,
+	[9422] = 20,
+	[9424] = 21,
+	[9426] = 22,
+	[9428] = 23,
+	[9430] = 24,
+	[9432] = 25,
+	[9434] = 26,
+	[9444] = 5,
+	[9448] = 6,
+	[9452] = 7,
 	[9472] = 0,
 	[9473] = 1,
-	[9479] = 18,
-	[9481] = 19,
-	[9483] = 20,
-	[9516] = 2,
-	[9517] = 21,
-	[9518] = 3,
-	[9519] = 22,
-	[9520] = 4,
-	[9521] = 23,
-	[9522] = 5,
-	[9523] = 24,
-	[9524] = 6,
-	[9525] = 25,
-	[9526] = 7,
-	[9527] = 26,
-	[9528] = 8,
-	[9529] = 27,
-	[9530] = 9,
-	[9531] = 28,
-	[9564] = 10,
-	[9565] = 29,
-	[9566] = 11,
-	[9567] = 30,
-	[9568] = 12,
-	[9569] = 31,
-	[9570] = 13,
-	[9571] = 32,
-	[9584] = 14,
-	[9585] = 15,
-	[9586] = 16,
-	[9587] = 17,
+	[9478] = 2,
+	[9480] = 3,
+	[9482] = 4,
+	[9516] = 8,
+	[9518] = 9,
+	[9520] = 10,
+	[9522] = 11,
+	[9524] = 12,
+	[9526] = 13,
+	[9528] = 14,
+	[9530] = 15,
+	[9564] = 16,
+	[9566] = 17,
+	[9568] = 18,
+	[9570] = 19,
+	[9572] = 5,
+	[9576] = 6,
+	[9580] = 7,
 	[9600] = 0,
 	[9601] = 1,
-	[9607] = 20,
-	[9609] = 21,
-	[9611] = 22,
-	[9624] = 2,
-	[9626] = 3,
-	[9628] = 4,
-	[9630] = 5,
-	[9632] = 6,
-	[9634] = 7,
-	[9636] = 8,
-	[9638] = 9,
-	[9640] = 10,
-	[9642] = 11,
-	[9645] = 23,
-	[9647] = 24,
-	[9649] = 25,
-	[9651] = 26,
-	[9653] = 27,
-	[9655] = 28,
-	[9657] = 29,
-	[9659] = 30,
-	[9692] = 12,
-	[9693] = 31,
-	[9694] = 13,
-	[9695] = 32,
-	[9696] = 14,
-	[9697] = 33,
-	[9698] = 15,
-	[9699] = 34,
-	[9712] = 16,
-	[9713] = 17,
-	[9714] = 18,
-	[9715] = 19,
+	[9606] = 2,
+	[9608] = 3,
+	[9610] = 4,
+	[9624] = 8,
+	[9626] = 9,
+	[9628] = 10,
+	[9630] = 11,
+	[9632] = 12,
+	[9634] = 13,
+	[9636] = 14,
+	[9638] = 15,
+	[9640] = 16,
+	[9642] = 17,
+	[9692] = 18,
+	[9694] = 19,
+	[9696] = 20,
+	[9698] = 21,
+	[9700] = 5,
+	[9704] = 6,
+	[9708] = 7,
 	[9728] = 0,
 	[9729] = 1,
-	[9735] = 18,
-	[9737] = 19,
-	[9739] = 20,
-	[9753] = 21,
-	[9755] = 22,
-	[9757] = 23,
-	[9759] = 24,
-	[9761] = 25,
-	[9763] = 26,
-	[9765] = 27,
-	[9767] = 28,
-	[9769] = 29,
-	[9771] = 30,
-	[9772] = 2,
-	[9774] = 3,
-	[9776] = 4,
-	[9778] = 5,
-	[9780] = 6,
-	[9782] = 7,
-	[9784] = 8,
-	[9786] = 9,
-	[9820] = 10,
-	[9821] = 31,
-	[9822] = 11,
-	[9823] = 32,
-	[9824] = 12,
-	[9825] = 33,
-	[9826] = 13,
-	[9827] = 34,
-	[9840] = 14,
-	[9841] = 15,
-	[9842] = 16,
-	[9843] = 17,
-	[9856] = 0,
-	[9857] = 1,
-	[9863] = 20,
-	[9865] = 21,
-	[9867] = 22,
-	[9880] = 2,
-	[9881] = 23,
-	[9882] = 3,
-	[9883] = 24,
-	[9884] = 4,
-	[9885] = 25,
-	[9886] = 5,
-	[9887] = 26,
-	[9888] = 6,
-	[9889] = 27,
-	[9890] = 7,
-	[9891] = 28,
-	[9892] = 8,
-	[9893] = 29,
-	[9894] = 9,
-	[9895] = 30,
-	[9896] = 10,
-	[9897] = 31,
-	[9898] = 11,
-	[9899] = 32,
-	[9948] = 12,
-	[9949] = 33,
-	[9950] = 13,
-	[9951] = 34,
-	[9952] = 14,
-	[9953] = 35,
-	[9954] = 15,
-	[9955] = 36,
-	[9968] = 16,
-	[9969] = 17,
-	[9970] = 18,
-	[9971] = 19,
-	[9984] = 0,
-	[9985] = 1,
-	[9991] = 18,
-	[9993] = 19,
-	[9995] = 20,
-	[9999] = 31,
-	[10001] = 32,
-	[10003] = 33,
-	[10005] = 34,
-	[10007] = 35,
-	[10009] = 21,
-	[10011] = 22,
-	[10013] = 23,
-	[10015] = 24,
-	[10017] = 25,
-	[10019] = 26,
-	[10021] = 27,
-	[10023] = 28,
-	[10025] = 29,
-	[10027] = 30,
-	[10028] = 2,
-	[10030] = 3,
-	[10032] = 4,
-	[10034] = 5,
-	[10036] = 6,
-	[10038] = 7,
-	[10040] = 8,
-	[10042] = 9,
-	[10076] = 10,
-	[10078] = 11,
-	[10080] = 12,
-	[10082] = 13,
-	[10096] = 14,
-	[10097] = 15,
-	[10098] = 16,
-	[10099] = 17,
-	[10112] = 0,
-	[10113] = 1,
-	[10119] = 20,
-	[10121] = 21,
-	[10123] = 22,
-	[10127] = 33,
-	[10129] = 34,
-	[10131] = 35,
-	[10133] = 36,
-	[10135] = 37,
-	[10136] = 2,
-	[10137] = 23,
-	[10138] = 3,
-	[10139] = 24,
-	[10140] = 4,
-	[10141] = 25,
-	[10142] = 5,
-	[10143] = 26,
-	[10144] = 6,
-	[10145] = 27,
-	[10146] = 7,
-	[10147] = 28,
-	[10148] = 8,
-	[10149] = 29,
-	[10150] = 9,
-	[10151] = 30,
-	[10152] = 10,
-	[10153] = 31,
-	[10154] = 11,
-	[10155] = 32,
-	[10204] = 12,
-	[10206] = 13,
-	[10208] = 14,
-	[10210] = 15,
-	[10224] = 16,
-	[10225] = 17,
-	[10226] = 18,
-	[10227] = 19,
-	[12288] = 0,
-	[12289] = 1,
-	[12294] = 2,
-	[12296] = 3,
-	[12298] = 4,
-	[12332] = 5,
-	[12334] = 6,
-	[12336] = 7,
-	[12338] = 8,
-	[12340] = 9,
-	[12342] = 10,
-	[12344] = 11,
-	[12346] = 12,
-	[12416] = 0,
-	[12417] = 1,
-	[12422] = 2,
-	[12424] = 3,
-	[12426] = 4,
-	[12440] = 5,
-	[12442] = 6,
-	[12444] = 7,
-	[12446] = 8,
-	[12448] = 9,
-	[12450] = 10,
-	[12452] = 11,
-	[12454] = 12,
-	[12456] = 13,
-	[12458] = 14,
-	[12544] = 0,
-	[12545] = 1,
-	[12550] = 2,
-	[12552] = 3,
-	[12554] = 4,
-	[12588] = 8,
-	[12590] = 9,
-	[12592] = 10,
-	[12594] = 11,
-	[12596] = 12,
-	[12598] = 13,
-	[12600] = 14,
-	[12602] = 15,
-	[12644] = 5,
-	[12648] = 6,
-	[12652] = 7,
-	[12672] = 0,
-	[12673] = 1,
-	[12678] = 2,
-	[12680] = 3,
-	[12682] = 4,
-	[12696] = 8,
-	[12698] = 9,
-	[12700] = 10,
-	[12702] = 11,
-	[12704] = 12,
-	[12706] = 13,
-	[12708] = 14,
-	[12710] = 15,
-	[12712] = 16,
-	[12714] = 17,
-	[12772] = 5,
-	[12776] = 6,
-	[12780] = 7,
-	[12800] = 0,
-	[12801] = 1,
-	[12806] = 2,
-	[12808] = 3,
-	[12810] = 4,
-	[12844] = 5,
-	[12846] = 6,
-	[12848] = 7,
-	[12850] = 8,
-	[12852] = 9,
-	[12854] = 10,
-	[12856] = 11,
-	[12858] = 12,
-	[12874] = 13,
-	[12876] = 14,
-	[12878] = 15,
-	[12880] = 16,
-	[12882] = 17,
-	[12884] = 18,
-	[12886] = 19,
-	[12888] = 20,
-	[12890] = 21,
-	[12928] = 0,
-	[12929] = 1,
-	[12934] = 2,
-	[12936] = 3,
-	[12938] = 4,
-	[12952] = 5,
-	[12954] = 6,
-	[12956] = 7,
-	[12958] = 8,
-	[12960] = 9,
-	[12962] = 10,
-	[12964] = 11,
-	[12966] = 12,
-	[12968] = 13,
-	[12970] = 14,
-	[13002] = 15,
-	[13004] = 16,
-	[13006] = 17,
-	[13008] = 18,
-	[13010] = 19,
-	[13012] = 20,
-	[13014] = 21,
-	[13016] = 22,
-	[13018] = 23,
-	[13056] = 0,
-	[13057] = 1,
-	[13062] = 2,
-	[13064] = 3,
-	[13066] = 4,
-	[13100] = 5,
-	[13102] = 6,
-	[13104] = 7,
-	[13106] = 8,
-	[13108] = 9,
-	[13110] = 10,
-	[13112] = 11,
-	[13114] = 12,
-	[13148] = 13,
-	[13150] = 14,
-	[13152] = 15,
-	[13154] = 16,
-	[13184] = 0,
-	[13185] = 1,
-	[13190] = 2,
-	[13192] = 3,
-	[13194] = 4,
-	[13208] = 5,
-	[13210] = 6,
-	[13212] = 7,
-	[13214] = 8,
-	[13216] = 9,
-	[13218] = 10,
-	[13220] = 11,
-	[13222] = 12,
-	[13224] = 13,
-	[13226] = 14,
-	[13276] = 15,
-	[13278] = 16,
-	[13280] = 17,
-	[13282] = 18,
-	[13312] = 0,
-	[13313] = 1,
-	[13318] = 2,
-	[13320] = 3,
-	[13322] = 4,
-	[13356] = 8,
-	[13358] = 9,
-	[13360] = 10,
-	[13362] = 11,
-	[13364] = 12,
-	[13366] = 13,
-	[13368] = 14,
-	[13370] = 15,
-	[13386] = 16,
-	[13388] = 17,
-	[13390] = 18,
-	[13392] = 19,
-	[13394] = 20,
-	[13396] = 21,
-	[13398] = 22,
-	[13400] = 23,
-	[13402] = 24,
-	[13412] = 5,
-	[13416] = 6,
-	[13420] = 7,
-	[13440] = 0,
-	[13441] = 1,
-	[13446] = 2,
-	[13448] = 3,
-	[13450] = 4,
-	[13464] = 8,
-	[13466] = 9,
-	[13468] = 10,
-	[13470] = 11,
-	[13472] = 12,
-	[13474] = 13,
-	[13476] = 14,
-	[13478] = 15,
-	[13480] = 16,
-	[13482] = 17,
-	[13514] = 18,
-	[13516] = 19,
-	[13518] = 20,
-	[13520] = 21,
-	[13522] = 22,
-	[13524] = 23,
-	[13526] = 24,
-	[13528] = 25,
-	[13530] = 26,
-	[13540] = 5,
-	[13544] = 6,
-	[13548] = 7,
-	[13568] = 0,
-	[13569] = 1,
-	[13574] = 2,
-	[13576] = 3,
-	[13578] = 4,
-	[13612] = 8,
-	[13614] = 9,
-	[13616] = 10,
-	[13618] = 11,
-	[13620] = 12,
-	[13622] = 13,
-	[13624] = 14,
-	[13626] = 15,
-	[13660] = 16,
-	[13662] = 17,
-	[13664] = 18,
-	[13666] = 19,
-	[13668] = 5,
-	[13672] = 6,
-	[13676] = 7,
-	[13696] = 0,
-	[13697] = 1,
-	[13702] = 2,
-	[13704] = 3,
-	[13706] = 4,
-	[13720] = 8,
-	[13722] = 9,
-	[13724] = 10,
-	[13726] = 11,
-	[13728] = 12,
-	[13730] = 13,
-	[13732] = 14,
-	[13734] = 15,
-	[13736] = 16,
-	[13738] = 17,
-	[13788] = 18,
-	[13790] = 19,
-	[13792] = 20,
-	[13794] = 21,
-	[13796] = 5,
-	[13800] = 6,
-	[13804] = 7
+	[9734] = 2,
+	[9736] = 3,
+	[9738] = 4,
+	[9752] = 5,
+	[9754] = 6,
+	[9756] = 7,
+	[9758] = 8,
+	[9760] = 9,
+	[9762] = 10,
+	[9764] = 11,
+	[9766] = 12,
+	[9768] = 13,
+	[9770] = 14,
+	[9820] = 15,
+	[9822] = 16,
+	[9824] = 17,
+	[9826] = 18,
+	[9840] = 19,
+	[9841] = 20,
+	[9842] = 21,
+	[9843] = 22,
+	[18048] = 0,
+	[18049] = 1,
+	[18054] = 2,
+	[18056] = 3,
+	[18058] = 4,
+	[18092] = 5,
+	[18094] = 6,
+	[18096] = 7,
+	[18098] = 8,
+	[18100] = 9,
+	[18102] = 10,
+	[18104] = 11,
+	[18106] = 12,
+	[18140] = 13,
+	[18142] = 14,
+	[18144] = 15,
+	[18146] = 16,
+	[18160] = 17,
+	[18161] = 18,
+	[18162] = 19,
+	[18163] = 20,
+	[18176] = 0,
+	[18177] = 1,
+	[18182] = 2,
+	[18184] = 3,
+	[18186] = 4,
+	[18200] = 5,
+	[18202] = 6,
+	[18204] = 7,
+	[18206] = 8,
+	[18208] = 9,
+	[18210] = 10,
+	[18212] = 11,
+	[18214] = 12,
+	[18216] = 13,
+	[18218] = 14,
+	[18268] = 15,
+	[18270] = 16,
+	[18272] = 17,
+	[18274] = 18,
+	[18288] = 19,
+	[18289] = 20,
+	[18290] = 21,
+	[18291] = 22,
+	[18304] = 0,
+	[18305] = 1,
+	[18311] = 18,
+	[18313] = 19,
+	[18315] = 20,
+	[18348] = 2,
+	[18349] = 21,
+	[18350] = 3,
+	[18351] = 22,
+	[18352] = 4,
+	[18353] = 23,
+	[18354] = 5,
+	[18355] = 24,
+	[18356] = 6,
+	[18357] = 25,
+	[18358] = 7,
+	[18359] = 26,
+	[18360] = 8,
+	[18361] = 27,
+	[18362] = 9,
+	[18363] = 28,
+	[18396] = 10,
+	[18398] = 11,
+	[18400] = 12,
+	[18402] = 13,
+	[18416] = 14,
+	[18417] = 15,
+	[18418] = 16,
+	[18419] = 17,
+	[18432] = 0,
+	[18433] = 1,
+	[18439] = 20,
+	[18441] = 21,
+	[18443] = 22,
+	[18456] = 2,
+	[18458] = 3,
+	[18460] = 4,
+	[18462] = 5,
+	[18464] = 6,
+	[18466] = 7,
+	[18468] = 8,
+	[18470] = 9,
+	[18472] = 10,
+	[18474] = 11,
+	[18477] = 23,
+	[18479] = 24,
+	[18481] = 25,
+	[18483] = 26,
+	[18485] = 27,
+	[18487] = 28,
+	[18489] = 29,
+	[18491] = 30,
+	[18524] = 12,
+	[18526] = 13,
+	[18528] = 14,
+	[18530] = 15,
+	[18544] = 16,
+	[18545] = 17,
+	[18546] = 18,
+	[18547] = 19,
+	[18560] = 0,
+	[18561] = 1,
+	[18567] = 18,
+	[18569] = 19,
+	[18571] = 20,
+	[18585] = 21,
+	[18587] = 22,
+	[18589] = 23,
+	[18591] = 24,
+	[18593] = 25,
+	[18595] = 26,
+	[18597] = 27,
+	[18599] = 28,
+	[18601] = 29,
+	[18603] = 30,
+	[18604] = 2,
+	[18606] = 3,
+	[18608] = 4,
+	[18610] = 5,
+	[18612] = 6,
+	[18614] = 7,
+	[18616] = 8,
+	[18618] = 9,
+	[18652] = 10,
+	[18654] = 11,
+	[18656] = 12,
+	[18658] = 13,
+	[18672] = 14,
+	[18673] = 15,
+	[18674] = 16,
+	[18675] = 17,
+	[18688] = 0,
+	[18689] = 1,
+	[18695] = 20,
+	[18697] = 21,
+	[18699] = 22,
+	[18712] = 2,
+	[18713] = 23,
+	[18714] = 3,
+	[18715] = 24,
+	[18716] = 4,
+	[18717] = 25,
+	[18718] = 5,
+	[18719] = 26,
+	[18720] = 6,
+	[18721] = 27,
+	[18722] = 7,
+	[18723] = 28,
+	[18724] = 8,
+	[18725] = 29,
+	[18726] = 9,
+	[18727] = 30,
+	[18728] = 10,
+	[18729] = 31,
+	[18730] = 11,
+	[18731] = 32,
+	[18780] = 12,
+	[18782] = 13,
+	[18784] = 14,
+	[18786] = 15,
+	[18800] = 16,
+	[18801] = 17,
+	[18802] = 18,
+	[18803] = 19,
+	[18816] = 0,
+	[18817] = 1,
+	[18823] = 18,
+	[18825] = 19,
+	[18827] = 20,
+	[18860] = 2,
+	[18861] = 21,
+	[18862] = 3,
+	[18863] = 22,
+	[18864] = 4,
+	[18865] = 23,
+	[18866] = 5,
+	[18867] = 24,
+	[18868] = 6,
+	[18869] = 25,
+	[18870] = 7,
+	[18871] = 26,
+	[18872] = 8,
+	[18873] = 27,
+	[18874] = 9,
+	[18875] = 28,
+	[18891] = 29,
+	[18893] = 30,
+	[18895] = 31,
+	[18897] = 32,
+	[18899] = 33,
+	[18901] = 34,
+	[18903] = 35,
+	[18905] = 36,
+	[18907] = 37,
+	[18908] = 10,
+	[18910] = 11,
+	[18912] = 12,
+	[18914] = 13,
+	[18928] = 14,
+	[18929] = 15,
+	[18930] = 16,
+	[18931] = 17,
+	[18944] = 0,
+	[18945] = 1,
+	[18951] = 20,
+	[18953] = 21,
+	[18955] = 22,
+	[18968] = 2,
+	[18970] = 3,
+	[18972] = 4,
+	[18974] = 5,
+	[18976] = 6,
+	[18978] = 7,
+	[18980] = 8,
+	[18982] = 9,
+	[18984] = 10,
+	[18986] = 11,
+	[18989] = 23,
+	[18991] = 24,
+	[18993] = 25,
+	[18995] = 26,
+	[18997] = 27,
+	[18999] = 28,
+	[19001] = 29,
+	[19003] = 30,
+	[19019] = 31,
+	[19021] = 32,
+	[19023] = 33,
+	[19025] = 34,
+	[19027] = 35,
+	[19029] = 36,
+	[19031] = 37,
+	[19033] = 38,
+	[19035] = 39,
+	[19036] = 12,
+	[19038] = 13,
+	[19040] = 14,
+	[19042] = 15,
+	[19056] = 16,
+	[19057] = 17,
+	[19058] = 18,
+	[19059] = 19,
+	[19072] = 0,
+	[19073] = 1,
+	[19079] = 18,
+	[19081] = 19,
+	[19083] = 20,
+	[19097] = 21,
+	[19099] = 22,
+	[19101] = 23,
+	[19103] = 24,
+	[19105] = 25,
+	[19107] = 26,
+	[19109] = 27,
+	[19111] = 28,
+	[19113] = 29,
+	[19115] = 30,
+	[19116] = 2,
+	[19118] = 3,
+	[19120] = 4,
+	[19122] = 5,
+	[19124] = 6,
+	[19126] = 7,
+	[19128] = 8,
+	[19130] = 9,
+	[19147] = 31,
+	[19149] = 32,
+	[19151] = 33,
+	[19153] = 34,
+	[19155] = 35,
+	[19157] = 36,
+	[19159] = 37,
+	[19161] = 38,
+	[19163] = 39,
+	[19164] = 10,
+	[19166] = 11,
+	[19168] = 12,
+	[19170] = 13,
+	[19184] = 14,
+	[19185] = 15,
+	[19186] = 16,
+	[19187] = 17,
+	[19200] = 0,
+	[19201] = 1,
+	[19207] = 20,
+	[19209] = 21,
+	[19211] = 22,
+	[19224] = 2,
+	[19225] = 23,
+	[19226] = 3,
+	[19227] = 24,
+	[19228] = 4,
+	[19229] = 25,
+	[19230] = 5,
+	[19231] = 26,
+	[19232] = 6,
+	[19233] = 27,
+	[19234] = 7,
+	[19235] = 28,
+	[19236] = 8,
+	[19237] = 29,
+	[19238] = 9,
+	[19239] = 30,
+	[19240] = 10,
+	[19241] = 31,
+	[19242] = 11,
+	[19243] = 32,
+	[19275] = 33,
+	[19277] = 34,
+	[19279] = 35,
+	[19281] = 36,
+	[19283] = 37,
+	[19285] = 38,
+	[19287] = 39,
+	[19289] = 40,
+	[19291] = 41,
+	[19292] = 12,
+	[19294] = 13,
+	[19296] = 14,
+	[19298] = 15,
+	[19312] = 16,
+	[19313] = 17,
+	[19314] = 18,
+	[19315] = 19,
+	[19328] = 0,
+	[19329] = 1,
+	[19335] = 18,
+	[19337] = 19,
+	[19339] = 20,
+	[19372] = 2,
+	[19373] = 21,
+	[19374] = 3,
+	[19375] = 22,
+	[19376] = 4,
+	[19377] = 23,
+	[19378] = 5,
+	[19379] = 24,
+	[19380] = 6,
+	[19381] = 25,
+	[19382] = 7,
+	[19383] = 26,
+	[19384] = 8,
+	[19385] = 27,
+	[19386] = 9,
+	[19387] = 28,
+	[19420] = 10,
+	[19421] = 29,
+	[19422] = 11,
+	[19423] = 30,
+	[19424] = 12,
+	[19425] = 31,
+	[19426] = 13,
+	[19427] = 32,
+	[19440] = 14,
+	[19441] = 15,
+	[19442] = 16,
+	[19443] = 17,
+	[19456] = 0,
+	[19457] = 1,
+	[19463] = 20,
+	[19465] = 21,
+	[19467] = 22,
+	[19480] = 2,
+	[19482] = 3,
+	[19484] = 4,
+	[19486] = 5,
+	[19488] = 6,
+	[19490] = 7,
+	[19492] = 8,
+	[19494] = 9,
+	[19496] = 10,
+	[19498] = 11,
+	[19501] = 23,
+	[19503] = 24,
+	[19505] = 25,
+	[19507] = 26,
+	[19509] = 27,
+	[19511] = 28,
+	[19513] = 29,
+	[19515] = 30,
+	[19548] = 12,
+	[19549] = 31,
+	[19550] = 13,
+	[19551] = 32,
+	[19552] = 14,
+	[19553] = 33,
+	[19554] = 15,
+	[19555] = 34,
+	[19568] = 16,
+	[19569] = 17,
+	[19570] = 18,
+	[19571] = 19,
+	[19584] = 0,
+	[19585] = 1,
+	[19591] = 18,
+	[19593] = 19,
+	[19595] = 20,
+	[19609] = 21,
+	[19611] = 22,
+	[19613] = 23,
+	[19615] = 24,
+	[19617] = 25,
+	[19619] = 26,
+	[19621] = 27,
+	[19623] = 28,
+	[19625] = 29,
+	[19627] = 30,
+	[19628] = 2,
+	[19630] = 3,
+	[19632] = 4,
+	[19634] = 5,
+	[19636] = 6,
+	[19638] = 7,
+	[19640] = 8,
+	[19642] = 9,
+	[19676] = 10,
+	[19677] = 31,
+	[19678] = 11,
+	[19679] = 32,
+	[19680] = 12,
+	[19681] = 33,
+	[19682] = 13,
+	[19683] = 34,
+	[19696] = 14,
+	[19697] = 15,
+	[19698] = 16,
+	[19699] = 17,
+	[19712] = 0,
+	[19713] = 1,
+	[19719] = 20,
+	[19721] = 21,
+	[19723] = 22,
+	[19736] = 2,
+	[19737] = 23,
+	[19738] = 3,
+	[19739] = 24,
+	[19740] = 4,
+	[19741] = 25,
+	[19742] = 5,
+	[19743] = 26,
+	[19744] = 6,
+	[19745] = 27,
+	[19746] = 7,
+	[19747] = 28,
+	[19748] = 8,
+	[19749] = 29,
+	[19750] = 9,
+	[19751] = 30,
+	[19752] = 10,
+	[19753] = 31,
+	[19754] = 11,
+	[19755] = 32,
+	[19804] = 12,
+	[19805] = 33,
+	[19806] = 13,
+	[19807] = 34,
+	[19808] = 14,
+	[19809] = 35,
+	[19810] = 15,
+	[19811] = 36,
+	[19824] = 16,
+	[19825] = 17,
+	[19826] = 18,
+	[19827] = 19,
+	[19840] = 0,
+	[19841] = 1,
+	[19847] = 18,
+	[19849] = 19,
+	[19851] = 20,
+	[19855] = 31,
+	[19857] = 32,
+	[19859] = 33,
+	[19861] = 34,
+	[19863] = 35,
+	[19865] = 21,
+	[19867] = 22,
+	[19869] = 23,
+	[19871] = 24,
+	[19873] = 25,
+	[19875] = 26,
+	[19877] = 27,
+	[19879] = 28,
+	[19881] = 29,
+	[19883] = 30,
+	[19884] = 2,
+	[19886] = 3,
+	[19888] = 4,
+	[19890] = 5,
+	[19892] = 6,
+	[19894] = 7,
+	[19896] = 8,
+	[19898] = 9,
+	[19932] = 10,
+	[19934] = 11,
+	[19936] = 12,
+	[19938] = 13,
+	[19952] = 14,
+	[19953] = 15,
+	[19954] = 16,
+	[19955] = 17,
+	[19968] = 0,
+	[19969] = 1,
+	[19975] = 20,
+	[19977] = 21,
+	[19979] = 22,
+	[19983] = 33,
+	[19985] = 34,
+	[19987] = 35,
+	[19989] = 36,
+	[19991] = 37,
+	[19992] = 2,
+	[19993] = 23,
+	[19994] = 3,
+	[19995] = 24,
+	[19996] = 4,
+	[19997] = 25,
+	[19998] = 5,
+	[19999] = 26,
+	[20000] = 6,
+	[20001] = 27,
+	[20002] = 7,
+	[20003] = 28,
+	[20004] = 8,
+	[20005] = 29,
+	[20006] = 9,
+	[20007] = 30,
+	[20008] = 10,
+	[20009] = 31,
+	[20010] = 11,
+	[20011] = 32,
+	[20060] = 12,
+	[20062] = 13,
+	[20064] = 14,
+	[20066] = 15,
+	[20080] = 16,
+	[20081] = 17,
+	[20082] = 18,
+	[20083] = 19,
+	[28288] = 0,
+	[28289] = 1,
+	[28294] = 2,
+	[28296] = 3,
+	[28298] = 4,
+	[28332] = 5,
+	[28334] = 6,
+	[28336] = 7,
+	[28338] = 8,
+	[28340] = 9,
+	[28342] = 10,
+	[28344] = 11,
+	[28346] = 12,
+	[28416] = 0,
+	[28417] = 1,
+	[28422] = 2,
+	[28424] = 3,
+	[28426] = 4,
+	[28440] = 5,
+	[28442] = 6,
+	[28444] = 7,
+	[28446] = 8,
+	[28448] = 9,
+	[28450] = 10,
+	[28452] = 11,
+	[28454] = 12,
+	[28456] = 13,
+	[28458] = 14,
+	[28544] = 0,
+	[28545] = 1,
+	[28550] = 2,
+	[28552] = 3,
+	[28554] = 4,
+	[28588] = 8,
+	[28590] = 9,
+	[28592] = 10,
+	[28594] = 11,
+	[28596] = 12,
+	[28598] = 13,
+	[28600] = 14,
+	[28602] = 15,
+	[28644] = 5,
+	[28648] = 6,
+	[28652] = 7,
+	[28672] = 0,
+	[28673] = 1,
+	[28678] = 2,
+	[28680] = 3,
+	[28682] = 4,
+	[28696] = 8,
+	[28698] = 9,
+	[28700] = 10,
+	[28702] = 11,
+	[28704] = 12,
+	[28706] = 13,
+	[28708] = 14,
+	[28710] = 15,
+	[28712] = 16,
+	[28714] = 17,
+	[28772] = 5,
+	[28776] = 6,
+	[28780] = 7,
+	[28800] = 0,
+	[28801] = 1,
+	[28806] = 2,
+	[28808] = 3,
+	[28810] = 4,
+	[28844] = 5,
+	[28846] = 6,
+	[28848] = 7,
+	[28850] = 8,
+	[28852] = 9,
+	[28854] = 10,
+	[28856] = 11,
+	[28858] = 12,
+	[28874] = 13,
+	[28876] = 14,
+	[28878] = 15,
+	[28880] = 16,
+	[28882] = 17,
+	[28884] = 18,
+	[28886] = 19,
+	[28888] = 20,
+	[28890] = 21,
+	[28928] = 0,
+	[28929] = 1,
+	[28934] = 2,
+	[28936] = 3,
+	[28938] = 4,
+	[28952] = 5,
+	[28954] = 6,
+	[28956] = 7,
+	[28958] = 8,
+	[28960] = 9,
+	[28962] = 10,
+	[28964] = 11,
+	[28966] = 12,
+	[28968] = 13,
+	[28970] = 14,
+	[29002] = 15,
+	[29004] = 16,
+	[29006] = 17,
+	[29008] = 18,
+	[29010] = 19,
+	[29012] = 20,
+	[29014] = 21,
+	[29016] = 22,
+	[29018] = 23,
+	[29056] = 0,
+	[29057] = 1,
+	[29062] = 2,
+	[29064] = 3,
+	[29066] = 4,
+	[29100] = 5,
+	[29102] = 6,
+	[29104] = 7,
+	[29106] = 8,
+	[29108] = 9,
+	[29110] = 10,
+	[29112] = 11,
+	[29114] = 12,
+	[29148] = 13,
+	[29150] = 14,
+	[29152] = 15,
+	[29154] = 16,
+	[29184] = 0,
+	[29185] = 1,
+	[29190] = 2,
+	[29192] = 3,
+	[29194] = 4,
+	[29208] = 5,
+	[29210] = 6,
+	[29212] = 7,
+	[29214] = 8,
+	[29216] = 9,
+	[29218] = 10,
+	[29220] = 11,
+	[29222] = 12,
+	[29224] = 13,
+	[29226] = 14,
+	[29276] = 15,
+	[29278] = 16,
+	[29280] = 17,
+	[29282] = 18,
+	[29312] = 0,
+	[29313] = 1,
+	[29318] = 2,
+	[29320] = 3,
+	[29322] = 4,
+	[29356] = 8,
+	[29358] = 9,
+	[29360] = 10,
+	[29362] = 11,
+	[29364] = 12,
+	[29366] = 13,
+	[29368] = 14,
+	[29370] = 15,
+	[29386] = 16,
+	[29388] = 17,
+	[29390] = 18,
+	[29392] = 19,
+	[29394] = 20,
+	[29396] = 21,
+	[29398] = 22,
+	[29400] = 23,
+	[29402] = 24,
+	[29412] = 5,
+	[29416] = 6,
+	[29420] = 7,
+	[29440] = 0,
+	[29441] = 1,
+	[29446] = 2,
+	[29448] = 3,
+	[29450] = 4,
+	[29464] = 8,
+	[29466] = 9,
+	[29468] = 10,
+	[29470] = 11,
+	[29472] = 12,
+	[29474] = 13,
+	[29476] = 14,
+	[29478] = 15,
+	[29480] = 16,
+	[29482] = 17,
+	[29514] = 18,
+	[29516] = 19,
+	[29518] = 20,
+	[29520] = 21,
+	[29522] = 22,
+	[29524] = 23,
+	[29526] = 24,
+	[29528] = 25,
+	[29530] = 26,
+	[29540] = 5,
+	[29544] = 6,
+	[29548] = 7,
+	[29568] = 0,
+	[29569] = 1,
+	[29574] = 2,
+	[29576] = 3,
+	[29578] = 4,
+	[29612] = 8,
+	[29614] = 9,
+	[29616] = 10,
+	[29618] = 11,
+	[29620] = 12,
+	[29622] = 13,
+	[29624] = 14,
+	[29626] = 15,
+	[29660] = 16,
+	[29662] = 17,
+	[29664] = 18,
+	[29666] = 19,
+	[29668] = 5,
+	[29672] = 6,
+	[29676] = 7,
+	[29696] = 0,
+	[29697] = 1,
+	[29702] = 2,
+	[29704] = 3,
+	[29706] = 4,
+	[29720] = 8,
+	[29722] = 9,
+	[29724] = 10,
+	[29726] = 11,
+	[29728] = 12,
+	[29730] = 13,
+	[29732] = 14,
+	[29734] = 15,
+	[29736] = 16,
+	[29738] = 17,
+	[29788] = 18,
+	[29790] = 19,
+	[29792] = 20,
+	[29794] = 21,
+	[29796] = 5,
+	[29800] = 6,
+	[29804] = 7
+};
+
+uint32_t ulp_glb_app_sig_tbl[] = {
+	[0] =  0,
 };
diff --git a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_tbl.h b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_tbl.h
index 328520c319..5dbafb8c45 100644
--- a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_tbl.h
+++ b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_tbl.h
@@ -106,6 +106,8 @@ extern struct bnxt_ulp_mapper_ident_info ulp_wh_plus_act_ident_list[];
 
 /* Global declarations */
 extern uint8_t ulp_glb_field_tbl[];
+extern uint32_t ulp_glb_app_sig_tbl[];
+extern uint32_t ulp_glb_app_sig_tbl[];
 
 extern struct
 bnxt_ulp_shared_act_info ulp_shared_act_info[];
diff --git a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_thor_act.c b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_thor_act.c
index 9d4ea8b422..c53d28c24b 100644
--- a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_thor_act.c
+++ b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_thor_act.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2014-2023 Broadcom
+ * Copyright(c) 2014-2024 Broadcom
  * All rights reserved.
  */
 
@@ -16,9 +16,9 @@ struct bnxt_ulp_mapper_tmpl_info ulp_thor_act_tmpl_list[] = {
 	.num_tbls = 9,
 	.start_tbl_idx = 0,
 	.reject_info = {
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_FALSE,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
 		.cond_start_idx = 0,
-		.cond_nums = 0 }
+		.cond_nums = 1 }
 	},
 	/* act_tid: 2, ingress */
 	[2] = {
@@ -27,7 +27,7 @@ struct bnxt_ulp_mapper_tmpl_info ulp_thor_act_tmpl_list[] = {
 	.start_tbl_idx = 9,
 	.reject_info = {
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_FALSE,
-		.cond_start_idx = 9,
+		.cond_start_idx = 10,
 		.cond_nums = 0 }
 	},
 	/* act_tid: 3, ingress */
@@ -36,9 +36,9 @@ struct bnxt_ulp_mapper_tmpl_info ulp_thor_act_tmpl_list[] = {
 	.num_tbls = 6,
 	.start_tbl_idx = 19,
 	.reject_info = {
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_FALSE,
-		.cond_start_idx = 13,
-		.cond_nums = 0 }
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 14,
+		.cond_nums = 1 }
 	},
 	/* act_tid: 4, ingress */
 	[4] = {
@@ -47,7 +47,7 @@ struct bnxt_ulp_mapper_tmpl_info ulp_thor_act_tmpl_list[] = {
 	.start_tbl_idx = 25,
 	.reject_info = {
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_FALSE,
-		.cond_start_idx = 18,
+		.cond_start_idx = 20,
 		.cond_nums = 0 }
 	},
 	/* act_tid: 5, ingress */
@@ -57,7 +57,7 @@ struct bnxt_ulp_mapper_tmpl_info ulp_thor_act_tmpl_list[] = {
 	.start_tbl_idx = 32,
 	.reject_info = {
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_FALSE,
-		.cond_start_idx = 25,
+		.cond_start_idx = 27,
 		.cond_nums = 0 }
 	},
 	/* act_tid: 6, egress */
@@ -66,9 +66,9 @@ struct bnxt_ulp_mapper_tmpl_info ulp_thor_act_tmpl_list[] = {
 	.num_tbls = 7,
 	.start_tbl_idx = 52,
 	.reject_info = {
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_FALSE,
-		.cond_start_idx = 40,
-		.cond_nums = 0 }
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 42,
+		.cond_nums = 1 }
 	},
 	/* act_tid: 7, egress */
 	[7] = {
@@ -76,38 +76,38 @@ struct bnxt_ulp_mapper_tmpl_info ulp_thor_act_tmpl_list[] = {
 	.num_tbls = 6,
 	.start_tbl_idx = 59,
 	.reject_info = {
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_FALSE,
-		.cond_start_idx = 47,
-		.cond_nums = 0 }
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 50,
+		.cond_nums = 1 }
 	},
 	/* act_tid: 8, egress */
 	[8] = {
 	.device_name = BNXT_ULP_DEVICE_ID_THOR,
-	.num_tbls = 15,
+	.num_tbls = 20,
 	.start_tbl_idx = 65,
 	.reject_info = {
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_FALSE,
-		.cond_start_idx = 52,
-		.cond_nums = 0 }
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 56,
+		.cond_nums = 1 }
 	},
 	/* act_tid: 9, egress */
 	[9] = {
 	.device_name = BNXT_ULP_DEVICE_ID_THOR,
 	.num_tbls = 5,
-	.start_tbl_idx = 80,
+	.start_tbl_idx = 85,
 	.reject_info = {
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_FALSE,
-		.cond_start_idx = 68,
-		.cond_nums = 0 }
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 81,
+		.cond_nums = 1 }
 	},
 	/* act_tid: 10, egress */
 	[10] = {
 	.device_name = BNXT_ULP_DEVICE_ID_THOR,
 	.num_tbls = 11,
-	.start_tbl_idx = 85,
+	.start_tbl_idx = 90,
 	.reject_info = {
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_FALSE,
-		.cond_start_idx = 71,
+		.cond_start_idx = 85,
 		.cond_nums = 0 }
 	}
 };
@@ -122,7 +122,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 2,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 0,
+		.cond_start_idx = 1,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_HASH,
@@ -141,7 +141,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1023,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 1,
+		.cond_start_idx = 2,
 		.cond_nums = 1 },
 	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP
 	},
@@ -155,7 +155,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 2,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 2,
+		.cond_start_idx = 3,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
@@ -174,7 +174,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1023,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 3,
+		.cond_start_idx = 4,
 		.cond_nums = 1 },
 	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP
 	},
@@ -188,7 +188,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 4,
+		.cond_start_idx = 5,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0,
@@ -208,7 +208,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 2,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 5,
+		.cond_start_idx = 6,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_MODIFY_PTR,
@@ -228,7 +228,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 2,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_OR,
-		.cond_start_idx = 6,
+		.cond_start_idx = 7,
 		.cond_nums = 3 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_MODIFY_PTR,
@@ -248,7 +248,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 0,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 9,
+		.cond_start_idx = 10,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
@@ -268,7 +268,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 0,
 		.cond_false_goto = 0,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 9,
+		.cond_start_idx = 10,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
@@ -285,7 +285,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 4,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 9,
+		.cond_start_idx = 10,
 		.cond_nums = 1 },
 	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP
 	},
@@ -299,7 +299,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 10,
+		.cond_start_idx = 11,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
@@ -319,7 +319,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 0,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 10,
+		.cond_start_idx = 11,
 		.cond_nums = 1 },
 	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP
 	},
@@ -330,7 +330,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 0,
 		.cond_false_goto = 1023,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 11,
+		.cond_start_idx = 12,
 		.cond_nums = 1 },
 	.fdb_opcode = BNXT_ULP_FDB_OPC_DELETE_RID_REGFILE,
 	.fdb_operand = BNXT_ULP_RF_IDX_RID,
@@ -349,7 +349,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 12,
+		.cond_start_idx = 13,
 		.cond_nums = 0 },
 	.fdb_opcode = BNXT_ULP_FDB_OPC_ALLOC_RID_REGFILE,
 	.fdb_operand = BNXT_ULP_RF_IDX_RID
@@ -364,7 +364,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 12,
+		.cond_start_idx = 13,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_MIRROR_PTR_0,
@@ -385,7 +385,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 12,
+		.cond_start_idx = 13,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0,
@@ -406,7 +406,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 13,
+		.cond_start_idx = 14,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
@@ -428,7 +428,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 13,
+		.cond_start_idx = 14,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_MIRROR_PTR_0,
@@ -448,7 +448,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 0,
 		.cond_false_goto = 0,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 13,
+		.cond_start_idx = 14,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_WRITE,
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
@@ -473,7 +473,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 2,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 13,
+		.cond_start_idx = 15,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
@@ -492,7 +492,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1023,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 14,
+		.cond_start_idx = 16,
 		.cond_nums = 1 },
 	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP
 	},
@@ -506,7 +506,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 15,
+		.cond_start_idx = 17,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0,
@@ -525,7 +525,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 2,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 16,
+		.cond_start_idx = 18,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_MODIFY_PTR,
@@ -545,7 +545,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 17,
+		.cond_start_idx = 19,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_MODIFY_PTR,
@@ -565,7 +565,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 0,
 		.cond_false_goto = 0,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 18,
+		.cond_start_idx = 20,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
@@ -584,7 +584,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 2,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 18,
+		.cond_start_idx = 20,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
@@ -603,7 +603,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1023,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 19,
+		.cond_start_idx = 21,
 		.cond_nums = 1 },
 	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP
 	},
@@ -617,7 +617,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 20,
+		.cond_start_idx = 22,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0,
@@ -636,7 +636,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 21,
+		.cond_start_idx = 23,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_VNIC_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_RSS_VNIC,
@@ -654,7 +654,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 22,
+		.cond_start_idx = 24,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_VNIC_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_RSS_VNIC,
@@ -673,7 +673,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 0,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_OR,
-		.cond_start_idx = 23,
+		.cond_start_idx = 25,
 		.cond_nums = 2 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
@@ -694,7 +694,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 0,
 		.cond_false_goto = 0,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 25,
+		.cond_start_idx = 27,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
@@ -712,7 +712,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 11,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 25,
+		.cond_start_idx = 27,
 		.cond_nums = 2 },
 	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP
 	},
@@ -725,7 +725,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 4,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 27,
+		.cond_start_idx = 29,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_HASH,
@@ -745,7 +745,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1023,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 28,
+		.cond_start_idx = 30,
 		.cond_nums = 1 },
 	.fdb_opcode = BNXT_ULP_FDB_OPC_ALLOC_RID_REGFILE,
 	.fdb_operand = BNXT_ULP_RF_IDX_RID
@@ -760,7 +760,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 29,
+		.cond_start_idx = 31,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_METER_PROFILE_PTR_0,
@@ -780,7 +780,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 0,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 29,
+		.cond_start_idx = 31,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_WRITE,
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_HASH,
@@ -803,7 +803,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1023,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 29,
+		.cond_start_idx = 31,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_HASH,
@@ -823,7 +823,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1023,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 30,
+		.cond_start_idx = 32,
 		.cond_nums = 1 },
 	.fdb_opcode = BNXT_ULP_FDB_OPC_ALLOC_RID_REGFILE,
 	.fdb_operand = BNXT_ULP_RF_IDX_RID
@@ -837,7 +837,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 31,
+		.cond_start_idx = 33,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_HASH,
@@ -857,7 +857,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1023,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 31,
+		.cond_start_idx = 33,
 		.cond_nums = 1 },
 	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP
 	},
@@ -871,7 +871,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 32,
+		.cond_start_idx = 34,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_METER_PTR_0,
@@ -890,7 +890,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 0,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 32,
+		.cond_start_idx = 34,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_WRITE,
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_HASH,
@@ -911,7 +911,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 5,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 32,
+		.cond_start_idx = 34,
 		.cond_nums = 1 },
 	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP
 	},
@@ -924,7 +924,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 2,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 33,
+		.cond_start_idx = 35,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_HASH,
@@ -944,7 +944,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 0,
 		.cond_false_goto = 1023,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 34,
+		.cond_start_idx = 36,
 		.cond_nums = 1 },
 	.fdb_opcode = BNXT_ULP_FDB_OPC_DELETE_RID_REGFILE,
 	.fdb_operand = BNXT_ULP_RF_IDX_RID,
@@ -965,7 +965,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1023,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 35,
+		.cond_start_idx = 37,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_HASH,
@@ -985,7 +985,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 0,
 		.cond_false_goto = 1023,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 36,
+		.cond_start_idx = 38,
 		.cond_nums = 1 },
 	.fdb_opcode = BNXT_ULP_FDB_OPC_DELETE_RID_REGFILE,
 	.fdb_operand = BNXT_ULP_RF_IDX_RID,
@@ -1004,7 +1004,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1023,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 37,
+		.cond_start_idx = 39,
 		.cond_nums = 0 },
 	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP
 	},
@@ -1017,7 +1017,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1023,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 37,
+		.cond_start_idx = 39,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_HASH,
@@ -1040,7 +1040,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1023,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 38,
+		.cond_start_idx = 40,
 		.cond_nums = 2 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_RD_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_METER_PTR_0,
@@ -1059,7 +1059,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 0,
 		.cond_false_goto = 0,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 40,
+		.cond_start_idx = 42,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_METER_PTR_0,
@@ -1078,7 +1078,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 2,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 40,
+		.cond_start_idx = 43,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
@@ -1097,7 +1097,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1023,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 41,
+		.cond_start_idx = 44,
 		.cond_nums = 1 },
 	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP
 	},
@@ -1111,7 +1111,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 42,
+		.cond_start_idx = 45,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0,
@@ -1130,7 +1130,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 43,
+		.cond_start_idx = 46,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_ENCAP_PTR_0,
@@ -1150,7 +1150,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 44,
+		.cond_start_idx = 47,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_MODIFY_PTR,
@@ -1170,7 +1170,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 0,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_OR,
-		.cond_start_idx = 45,
+		.cond_start_idx = 48,
 		.cond_nums = 2 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
@@ -1189,7 +1189,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 0,
 		.cond_false_goto = 0,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 47,
+		.cond_start_idx = 50,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
@@ -1208,7 +1208,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 2,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 47,
+		.cond_start_idx = 51,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
@@ -1227,7 +1227,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1023,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 48,
+		.cond_start_idx = 52,
 		.cond_nums = 1 },
 	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP
 	},
@@ -1241,7 +1241,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 49,
+		.cond_start_idx = 53,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0,
@@ -1260,7 +1260,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 2,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 50,
+		.cond_start_idx = 54,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_MODIFY_PTR,
@@ -1280,7 +1280,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 51,
+		.cond_start_idx = 55,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_MODIFY_PTR,
@@ -1300,7 +1300,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 0,
 		.cond_false_goto = 0,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 52,
+		.cond_start_idx = 56,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
@@ -1319,7 +1319,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 2,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 52,
+		.cond_start_idx = 57,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
@@ -1338,7 +1338,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1023,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 53,
+		.cond_start_idx = 58,
 		.cond_nums = 1 },
 	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP
 	},
@@ -1352,7 +1352,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 54,
+		.cond_start_idx = 59,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0,
@@ -1368,9 +1368,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 	.direction = TF_DIR_TX,
 	.execute_info = {
 		.cond_true_goto  = 1,
-		.cond_false_goto = 1,
+		.cond_false_goto = 4,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 55,
+		.cond_start_idx = 60,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_HASH,
@@ -1389,7 +1389,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 3,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 56,
+		.cond_start_idx = 61,
 		.cond_nums = 1 },
 	.fdb_opcode = BNXT_ULP_FDB_OPC_ALLOC_RID_REGFILE,
 	.fdb_operand = BNXT_ULP_RF_IDX_RID
@@ -1404,7 +1404,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 57,
+		.cond_start_idx = 62,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_SP_PTR,
@@ -1425,7 +1425,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 58,
+		.cond_start_idx = 63,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_WRITE,
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_HASH,
@@ -1438,83 +1438,42 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 	.result_bit_size = 48,
 	.result_num_fields = 2
 	},
-	{ /* act_tid: 8, , table: sp_smac_ipv6.0 */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type = TF_TBL_TYPE_ACT_SP_SMAC_IPV6,
-	.resource_sub_type =
-		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
-	.direction = TF_DIR_TX,
-	.execute_info = {
-		.cond_true_goto  = 1,
-		.cond_false_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 58,
-		.cond_nums = 1 },
-	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_SP_PTR,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.record_size = 32,
-	.result_start_idx = 523,
-	.result_bit_size = 0,
-	.result_num_fields = 0,
-	.encap_num_fields = 3
-	},
-	{ /* act_tid: 8, , table: vxlan_encap_rec_cache.rd */
+	{ /* act_tid: 8, , table: source_property_ipv6_cache.rd */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
 	.resource_sub_type =
-		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_VXLAN_ENCAP_REC_CACHE,
+		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_SOURCE_PROPERTY_IPV6_CACHE,
 	.direction = TF_DIR_TX,
 	.execute_info = {
 		.cond_true_goto  = 1,
-		.cond_false_goto = 1,
+		.cond_false_goto = 4,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 59,
-		.cond_nums = 2 },
+		.cond_start_idx = 63,
+		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_HASH,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
 	.key_start_idx = 21,
-	.blob_key_bit_size = 136,
-	.key_bit_size = 136,
-	.key_num_fields = 5,
+	.blob_key_bit_size = 176,
+	.key_bit_size = 176,
+	.key_num_fields = 2,
 	.ident_start_idx = 16,
 	.ident_nums = 1
 	},
-	{ /* act_tid: 8, , table: mod_record.ing_l2write */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type = TF_TBL_TYPE_ACT_MODIFY_64B,
-	.resource_sub_type =
-		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
-	.direction = TF_DIR_TX,
-	.execute_info = {
-		.cond_true_goto  = 1,
-		.cond_false_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_OR,
-		.cond_start_idx = 61,
-		.cond_nums = 2 },
-	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_MODIFY_PTR,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 526,
-	.result_bit_size = 0,
-	.result_num_fields = 0,
-	.encap_num_fields = 47
-	},
-	{ /* act_tid: 8, , table: control.0 */
+	{ /* act_tid: 8, , table: control.0.ipv6 */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
 	.direction = TF_DIR_TX,
 	.execute_info = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 3,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 63,
+		.cond_start_idx = 64,
 		.cond_nums = 1 },
 	.fdb_opcode = BNXT_ULP_FDB_OPC_ALLOC_RID_REGFILE,
 	.fdb_operand = BNXT_ULP_RF_IDX_RID
 	},
-	{ /* act_tid: 8, , table: int_tun_encap_record.ipv4_vxlan */
+	{ /* act_tid: 8, , table: sp_smac_ipv6.0 */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type = TF_TBL_TYPE_ACT_ENCAP_64B,
+	.resource_type = TF_TBL_TYPE_ACT_SP_SMAC_IPV6,
 	.resource_sub_type =
 		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
 	.direction = TF_DIR_TX,
@@ -1522,21 +1481,21 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 64,
-		.cond_nums = 2 },
+		.cond_start_idx = 65,
+		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_ENCAP_PTR_0,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
-	.fdb_operand = BNXT_ULP_RF_IDX_RID,
-	.result_start_idx = 573,
+	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_SP_PTR,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.record_size = 32,
+	.result_start_idx = 523,
 	.result_bit_size = 0,
 	.result_num_fields = 0,
-	.encap_num_fields = 30
+	.encap_num_fields = 3
 	},
-	{ /* act_tid: 8, , table: vxlan_encap_rec_cache.wr */
+	{ /* act_tid: 8, , table: source_property_ipv6_cache.wr */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
 	.resource_sub_type =
-		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_VXLAN_ENCAP_REC_CACHE,
+		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_SOURCE_PROPERTY_IPV6_CACHE,
 	.direction = TF_DIR_TX,
 	.execute_info = {
 		.cond_true_goto  = 1,
@@ -1547,34 +1506,173 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_WRITE,
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_HASH,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.key_start_idx = 26,
-	.blob_key_bit_size = 136,
-	.key_bit_size = 136,
-	.key_num_fields = 5,
-	.result_start_idx = 603,
+	.key_start_idx = 23,
+	.blob_key_bit_size = 176,
+	.key_bit_size = 176,
+	.key_num_fields = 2,
+	.result_start_idx = 526,
 	.result_bit_size = 48,
 	.result_num_fields = 2
 	},
-	{ /* act_tid: 8, , table: int_tun_encap_record.ipv6_vxlan */
+	{ /* act_tid: 8, , table: mod_record.ing_l2write */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type = TF_TBL_TYPE_ACT_ENCAP_64B,
+	.resource_type = TF_TBL_TYPE_ACT_MODIFY_64B,
 	.resource_sub_type =
 		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
 	.direction = TF_DIR_TX,
 	.execute_info = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_OR,
 		.cond_start_idx = 66,
 		.cond_nums = 2 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_ENCAP_PTR_0,
+	.tbl_operand = BNXT_ULP_RF_IDX_MODIFY_PTR,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 605,
+	.result_start_idx = 528,
+	.result_bit_size = 0,
+	.result_num_fields = 0,
+	.encap_num_fields = 47
+	},
+	{ /* act_tid: 8, , table: vxlan_encap_rec_cache.rd */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_VXLAN_ENCAP_REC_CACHE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 68,
+		.cond_nums = 2 },
+	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
+	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_HASH,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.key_start_idx = 25,
+	.blob_key_bit_size = 136,
+	.key_bit_size = 136,
+	.key_num_fields = 5,
+	.ident_start_idx = 17,
+	.ident_nums = 1
+	},
+	{ /* act_tid: 8, , table: vxlan_encap_ipv6_rec_cache.rd */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_VXLAN_ENCAP_IPV6_REC_CACHE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 70,
+		.cond_nums = 2 },
+	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
+	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_HASH,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.key_start_idx = 30,
+	.blob_key_bit_size = 232,
+	.key_bit_size = 232,
+	.key_num_fields = 5,
+	.ident_start_idx = 18,
+	.ident_nums = 1
+	},
+	{ /* act_tid: 8, , table: control.1 */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 5,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 72,
+		.cond_nums = 1 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_ALLOC_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID
+	},
+	{ /* act_tid: 8, , table: int_tun_encap_record.ipv4_vxlan */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_ACT_ENCAP_64B,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 73,
+		.cond_nums = 2 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_ENCAP_PTR_0,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.result_start_idx = 575,
 	.result_bit_size = 0,
 	.result_num_fields = 0,
 	.encap_num_fields = 30
 	},
+	{ /* act_tid: 8, , table: int_tun_encap_record.ipv6_vxlan */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_ACT_ENCAP_64B,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 75,
+		.cond_nums = 2 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_ENCAP_PTR_0,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.result_start_idx = 605,
+	.result_bit_size = 0,
+	.result_num_fields = 0,
+	.encap_num_fields = 30
+	},
+	{ /* act_tid: 8, , table: vxlan_encap_rec_cache.wr */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_VXLAN_ENCAP_REC_CACHE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 77,
+		.cond_nums = 2 },
+	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_WRITE,
+	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_HASH,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.key_start_idx = 35,
+	.blob_key_bit_size = 136,
+	.key_bit_size = 136,
+	.key_num_fields = 5,
+	.result_start_idx = 635,
+	.result_bit_size = 48,
+	.result_num_fields = 2
+	},
+	{ /* act_tid: 8, , table: vxlan_encap_ipv6_rec_cache.wr */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_VXLAN_ENCAP_IPV6_REC_CACHE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 79,
+		.cond_nums = 2 },
+	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_WRITE,
+	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_HASH,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.key_start_idx = 40,
+	.blob_key_bit_size = 232,
+	.key_bit_size = 232,
+	.key_num_fields = 5,
+	.result_start_idx = 637,
+	.result_bit_size = 48,
+	.result_num_fields = 2
+	},
 	{ /* act_tid: 8, , table: int_full_act_record.0 */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
 	.resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
@@ -1585,13 +1683,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 0,
 		.cond_false_goto = 0,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 68,
+		.cond_start_idx = 81,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
 	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-	.result_start_idx = 635,
+	.result_start_idx = 639,
 	.result_bit_size = 128,
 	.result_num_fields = 17
 	},
@@ -1605,16 +1703,16 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 2,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 68,
+		.cond_start_idx = 82,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.key_start_idx = 31,
+	.key_start_idx = 45,
 	.blob_key_bit_size = 4,
 	.key_bit_size = 4,
 	.key_num_fields = 1,
-	.ident_start_idx = 17,
+	.ident_start_idx = 19,
 	.ident_nums = 1
 	},
 	{ /* act_tid: 9, , table: control.mirror */
@@ -1624,7 +1722,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1023,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 69,
+		.cond_start_idx = 83,
 		.cond_nums = 1 },
 	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP
 	},
@@ -1638,12 +1736,12 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 70,
+		.cond_start_idx = 84,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 652,
+	.result_start_idx = 656,
 	.result_bit_size = 64,
 	.result_num_fields = 1
 	},
@@ -1657,12 +1755,12 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 71,
+		.cond_start_idx = 85,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_MODIFY_PTR,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 653,
+	.result_start_idx = 657,
 	.result_bit_size = 0,
 	.result_num_fields = 0,
 	.encap_num_fields = 47
@@ -1677,12 +1775,12 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 0,
 		.cond_false_goto = 0,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 71,
+		.cond_start_idx = 85,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 700,
+	.result_start_idx = 704,
 	.result_bit_size = 128,
 	.result_num_fields = 17
 	},
@@ -1693,7 +1791,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 4,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 71,
+		.cond_start_idx = 85,
 		.cond_nums = 1 },
 	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP
 	},
@@ -1707,17 +1805,17 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 72,
+		.cond_start_idx = 86,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
 	.ref_cnt_opcode = BNXT_ULP_REF_CNT_OPC_NOP,
-	.key_start_idx = 32,
+	.key_start_idx = 46,
 	.blob_key_bit_size = 4,
 	.key_bit_size = 4,
 	.key_num_fields = 1,
-	.ident_start_idx = 18,
+	.ident_start_idx = 20,
 	.ident_nums = 1
 	},
 	{ /* act_tid: 10, , table: control.mirror_del_exist_chk */
@@ -1727,7 +1825,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 0,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 72,
+		.cond_start_idx = 86,
 		.cond_nums = 1 },
 	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP
 	},
@@ -1738,7 +1836,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 0,
 		.cond_false_goto = 1023,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 73,
+		.cond_start_idx = 87,
 		.cond_nums = 1 },
 	.fdb_opcode = BNXT_ULP_FDB_OPC_DELETE_RID_REGFILE,
 	.fdb_operand = BNXT_ULP_RF_IDX_RID,
@@ -1757,7 +1855,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 74,
+		.cond_start_idx = 88,
 		.cond_nums = 0 },
 	.fdb_opcode = BNXT_ULP_FDB_OPC_ALLOC_RID_REGFILE,
 	.fdb_operand = BNXT_ULP_RF_IDX_RID
@@ -1772,14 +1870,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 74,
+		.cond_start_idx = 88,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_MIRROR_PTR_0,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
 	.fdb_operand = BNXT_ULP_RF_IDX_RID,
 	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-	.result_start_idx = 717,
+	.result_start_idx = 721,
 	.result_bit_size = 32,
 	.result_num_fields = 5
 	},
@@ -1793,14 +1891,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 74,
+		.cond_start_idx = 88,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
 	.fdb_operand = BNXT_ULP_RF_IDX_RID,
 	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-	.result_start_idx = 722,
+	.result_start_idx = 726,
 	.result_bit_size = 64,
 	.result_num_fields = 1
 	},
@@ -1814,13 +1912,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 75,
+		.cond_start_idx = 89,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_MODIFY_PTR,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
 	.fdb_operand = BNXT_ULP_RF_IDX_RID,
-	.result_start_idx = 723,
+	.result_start_idx = 727,
 	.result_bit_size = 0,
 	.result_num_fields = 0,
 	.encap_num_fields = 47
@@ -1835,14 +1933,14 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 75,
+		.cond_start_idx = 89,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
 	.fdb_operand = BNXT_ULP_RF_IDX_RID,
 	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-	.result_start_idx = 770,
+	.result_start_idx = 774,
 	.result_bit_size = 128,
 	.result_num_fields = 17
 	},
@@ -1856,13 +1954,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 75,
+		.cond_start_idx = 89,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_MIRROR_PTR_0,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
 	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-	.result_start_idx = 787,
+	.result_start_idx = 791,
 	.result_bit_size = 32,
 	.result_num_fields = 5
 	},
@@ -1876,24 +1974,29 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_act_tbl_list[] = {
 		.cond_true_goto  = 0,
 		.cond_false_goto = 0,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 75,
+		.cond_start_idx = 89,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_WRITE,
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
 	.fdb_operand = BNXT_ULP_RF_IDX_RID,
 	.ref_cnt_opcode = BNXT_ULP_REF_CNT_OPC_INC,
-	.key_start_idx = 33,
+	.key_start_idx = 47,
 	.blob_key_bit_size = 4,
 	.key_bit_size = 4,
 	.key_num_fields = 1,
-	.result_start_idx = 792,
+	.result_start_idx = 796,
 	.result_bit_size = 36,
 	.result_num_fields = 2
 	}
 };
 
 struct bnxt_ulp_mapper_cond_info ulp_thor_act_cond_list[] = {
+	/* cond_reject: thor, act_tid: 1 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_MULTIPLE_PORT
+	},
 	/* cond_execute: act_tid: 1, shared_meter_tbl_cache.rd */
 	{
 	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
@@ -1957,6 +2060,11 @@ struct bnxt_ulp_mapper_cond_info ulp_thor_act_cond_list[] = {
 	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
 	.cond_operand = BNXT_ULP_ACT_BIT_COUNT
 	},
+	/* cond_reject: thor, act_tid: 3 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_MULTIPLE_PORT
+	},
 	/* cond_execute: act_tid: 3, shared_mirror_record.rd */
 	{
 	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
@@ -2089,6 +2197,11 @@ struct bnxt_ulp_mapper_cond_info ulp_thor_act_cond_list[] = {
 	.cond_opcode = BNXT_ULP_COND_OPC_ACT_PROP_NOT_SET,
 	.cond_operand = BNXT_ULP_ACT_PROP_IDX_METER_PROF_ID_UPDATE
 	},
+	/* cond_reject: thor, act_tid: 6 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_MULTIPLE_PORT
+	},
 	/* cond_execute: act_tid: 6, shared_mirror_record.rd */
 	{
 	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
@@ -2123,6 +2236,11 @@ struct bnxt_ulp_mapper_cond_info ulp_thor_act_cond_list[] = {
 	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
 	.cond_operand = BNXT_ULP_ACT_BIT_PUSH_VLAN
 	},
+	/* cond_reject: thor, act_tid: 7 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_MULTIPLE_PORT
+	},
 	/* cond_execute: act_tid: 7, shared_mirror_record.rd */
 	{
 	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
@@ -2148,6 +2266,11 @@ struct bnxt_ulp_mapper_cond_info ulp_thor_act_cond_list[] = {
 	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_NOT_SET,
 	.cond_operand = BNXT_ULP_ACT_BIT_DEC_TTL
 	},
+	/* cond_reject: thor, act_tid: 8 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_MULTIPLE_PORT
+	},
 	/* cond_execute: act_tid: 8, shared_mirror_record.rd */
 	{
 	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
@@ -2178,11 +2301,30 @@ struct bnxt_ulp_mapper_cond_info ulp_thor_act_cond_list[] = {
 	.cond_opcode = BNXT_ULP_COND_OPC_CF_IS_SET,
 	.cond_operand = BNXT_ULP_CF_IDX_ACT_ENCAP_IPV4_FLAG
 	},
+	/* cond_execute: act_tid: 8, source_property_ipv6_cache.rd */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_CF_IS_SET,
+	.cond_operand = BNXT_ULP_CF_IDX_ACT_ENCAP_IPV6_FLAG
+	},
+	/* cond_execute: act_tid: 8, control.0.ipv6 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_RF_IS_SET,
+	.cond_operand = BNXT_ULP_RF_IDX_GENERIC_TBL_MISS
+	},
 	/* cond_execute: act_tid: 8, sp_smac_ipv6.0 */
 	{
 	.cond_opcode = BNXT_ULP_COND_OPC_CF_IS_SET,
 	.cond_operand = BNXT_ULP_CF_IDX_ACT_ENCAP_IPV6_FLAG
 	},
+	/* cond_execute: act_tid: 8, mod_record.ing_l2write */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_SET_MAC_SRC
+	},
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_SET_MAC_DST
+	},
 	/* cond_execute: act_tid: 8, vxlan_encap_rec_cache.rd */
 	{
 	.cond_opcode = BNXT_ULP_COND_OPC_ENC_HDR_BIT_IS_SET,
@@ -2192,16 +2334,16 @@ struct bnxt_ulp_mapper_cond_info ulp_thor_act_cond_list[] = {
 	.cond_opcode = BNXT_ULP_COND_OPC_ENC_HDR_BIT_IS_SET,
 	.cond_operand = BNXT_ULP_HDR_BIT_T_VXLAN
 	},
-	/* cond_execute: act_tid: 8, mod_record.ing_l2write */
+	/* cond_execute: act_tid: 8, vxlan_encap_ipv6_rec_cache.rd */
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_SET_MAC_SRC
+	.cond_opcode = BNXT_ULP_COND_OPC_ENC_HDR_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_HDR_BIT_O_IPV6
 	},
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_SET_MAC_DST
+	.cond_opcode = BNXT_ULP_COND_OPC_ENC_HDR_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_HDR_BIT_T_VXLAN
 	},
-	/* cond_execute: act_tid: 8, control.0 */
+	/* cond_execute: act_tid: 8, control.1 */
 	{
 	.cond_opcode = BNXT_ULP_COND_OPC_RF_IS_SET,
 	.cond_operand = BNXT_ULP_RF_IDX_GENERIC_TBL_MISS
@@ -2224,6 +2366,29 @@ struct bnxt_ulp_mapper_cond_info ulp_thor_act_cond_list[] = {
 	.cond_opcode = BNXT_ULP_COND_OPC_ENC_HDR_BIT_IS_SET,
 	.cond_operand = BNXT_ULP_HDR_BIT_T_VXLAN
 	},
+	/* cond_execute: act_tid: 8, vxlan_encap_rec_cache.wr */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ENC_HDR_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_HDR_BIT_O_IPV4
+	},
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ENC_HDR_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_HDR_BIT_T_VXLAN
+	},
+	/* cond_execute: act_tid: 8, vxlan_encap_ipv6_rec_cache.wr */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ENC_HDR_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_HDR_BIT_O_IPV6
+	},
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ENC_HDR_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_HDR_BIT_T_VXLAN
+	},
+	/* cond_reject: thor, act_tid: 9 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_MULTIPLE_PORT
+	},
 	/* cond_execute: act_tid: 9, shared_mirror_record.rd */
 	{
 	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
@@ -2537,19 +2702,338 @@ struct bnxt_ulp_mapper_key_info ulp_thor_act_key_info_list[] = {
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "sw_meter_id",
-		.field_bit_size = 32,
+		.description = "sw_meter_id",
+		.field_bit_size = 32,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+		.field_opr1 = {
+		(BNXT_ULP_ACT_PROP_IDX_METER_INST_ID >> 8) & 0xff,
+		BNXT_ULP_ACT_PROP_IDX_METER_INST_ID & 0xff}
+		}
+	},
+	/* act_tid: 5, , table: shared_meter_tbl_cache.rd_update */
+	{
+	.field_info_mask = {
+		.description = "sw_meter_id",
+		.field_bit_size = 32,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff,
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "sw_meter_id",
+		.field_bit_size = 32,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+		.field_opr1 = {
+		(BNXT_ULP_ACT_PROP_IDX_METER_INST_ID >> 8) & 0xff,
+		BNXT_ULP_ACT_PROP_IDX_METER_INST_ID & 0xff}
+		}
+	},
+	/* act_tid: 6, , table: shared_mirror_record.rd */
+	{
+	.field_info_mask = {
+		.description = "shared_index",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "shared_index",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+		.field_opr1 = {
+		(BNXT_ULP_ACT_PROP_IDX_SHARED_HANDLE >> 8) & 0xff,
+		BNXT_ULP_ACT_PROP_IDX_SHARED_HANDLE & 0xff}
+		}
+	},
+	/* act_tid: 7, , table: shared_mirror_record.rd */
+	{
+	.field_info_mask = {
+		.description = "shared_index",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "shared_index",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+		.field_opr1 = {
+		(BNXT_ULP_ACT_PROP_IDX_SHARED_HANDLE >> 8) & 0xff,
+		BNXT_ULP_ACT_PROP_IDX_SHARED_HANDLE & 0xff}
+		}
+	},
+	/* act_tid: 8, , table: shared_mirror_record.rd */
+	{
+	.field_info_mask = {
+		.description = "shared_index",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "shared_index",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+		.field_opr1 = {
+		(BNXT_ULP_ACT_PROP_IDX_SHARED_HANDLE >> 8) & 0xff,
+		BNXT_ULP_ACT_PROP_IDX_SHARED_HANDLE & 0xff}
+		}
+	},
+	/* act_tid: 8, , table: source_property_cache.rd */
+	{
+	.field_info_mask = {
+		.description = "smac",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "smac",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+		.field_opr1 = {
+		(BNXT_ULP_ENC_FIELD_ETH_SMAC >> 8) & 0xff,
+		BNXT_ULP_ENC_FIELD_ETH_SMAC & 0xff}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "ipv4_src_addr",
+		.field_bit_size = 32,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff,
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "ipv4_src_addr",
+		.field_bit_size = 32,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+		.field_opr1 = {
+		(BNXT_ULP_ENC_FIELD_IPV4_SADDR >> 8) & 0xff,
+		BNXT_ULP_ENC_FIELD_IPV4_SADDR & 0xff}
+		}
+	},
+	/* act_tid: 8, , table: source_property_cache.wr */
+	{
+	.field_info_mask = {
+		.description = "smac",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "smac",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+		.field_opr1 = {
+		(BNXT_ULP_ENC_FIELD_ETH_SMAC >> 8) & 0xff,
+		BNXT_ULP_ENC_FIELD_ETH_SMAC & 0xff}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "ipv4_src_addr",
+		.field_bit_size = 32,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff,
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "ipv4_src_addr",
+		.field_bit_size = 32,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+		.field_opr1 = {
+		(BNXT_ULP_ENC_FIELD_IPV4_SADDR >> 8) & 0xff,
+		BNXT_ULP_ENC_FIELD_IPV4_SADDR & 0xff}
+		}
+	},
+	/* act_tid: 8, , table: source_property_ipv6_cache.rd */
+	{
+	.field_info_mask = {
+		.description = "smac",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "smac",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+		.field_opr1 = {
+		(BNXT_ULP_ENC_FIELD_ETH_SMAC >> 8) & 0xff,
+		BNXT_ULP_ENC_FIELD_ETH_SMAC & 0xff}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "ipv6_src_addr",
+		.field_bit_size = 128,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "ipv6_src_addr",
+		.field_bit_size = 128,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+		.field_opr1 = {
+		(BNXT_ULP_ENC_FIELD_IPV6_SADDR >> 8) & 0xff,
+		BNXT_ULP_ENC_FIELD_IPV6_SADDR & 0xff}
+		}
+	},
+	/* act_tid: 8, , table: source_property_ipv6_cache.wr */
+	{
+	.field_info_mask = {
+		.description = "smac",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "smac",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+		.field_opr1 = {
+		(BNXT_ULP_ENC_FIELD_ETH_SMAC >> 8) & 0xff,
+		BNXT_ULP_ENC_FIELD_ETH_SMAC & 0xff}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "ipv6_src_addr",
+		.field_bit_size = 128,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "ipv6_src_addr",
+		.field_bit_size = 128,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+		.field_opr1 = {
+		(BNXT_ULP_ENC_FIELD_IPV6_SADDR >> 8) & 0xff,
+		BNXT_ULP_ENC_FIELD_IPV6_SADDR & 0xff}
+		}
+	},
+	/* act_tid: 8, , table: vxlan_encap_rec_cache.rd */
+	{
+	.field_info_mask = {
+		.description = "dmac",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "dmac",
+		.field_bit_size = 48,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
 		.field_opr1 = {
-		(BNXT_ULP_ACT_PROP_IDX_METER_INST_ID >> 8) & 0xff,
-		BNXT_ULP_ACT_PROP_IDX_METER_INST_ID & 0xff}
+		(BNXT_ULP_ENC_FIELD_ETH_DMAC >> 8) & 0xff,
+		BNXT_ULP_ENC_FIELD_ETH_DMAC & 0xff}
 		}
 	},
-	/* act_tid: 5, , table: shared_meter_tbl_cache.rd_update */
 	{
 	.field_info_mask = {
-		.description = "sw_meter_id",
+		.description = "ipv4_dst_addr",
 		.field_bit_size = 32,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
@@ -2560,79 +3044,80 @@ struct bnxt_ulp_mapper_key_info ulp_thor_act_key_info_list[] = {
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "sw_meter_id",
+		.description = "ipv4_dst_addr",
 		.field_bit_size = 32,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
 		.field_opr1 = {
-		(BNXT_ULP_ACT_PROP_IDX_METER_INST_ID >> 8) & 0xff,
-		BNXT_ULP_ACT_PROP_IDX_METER_INST_ID & 0xff}
+		(BNXT_ULP_ENC_FIELD_IPV4_DADDR >> 8) & 0xff,
+		BNXT_ULP_ENC_FIELD_IPV4_DADDR & 0xff}
 		}
 	},
-	/* act_tid: 6, , table: shared_mirror_record.rd */
 	{
 	.field_info_mask = {
-		.description = "shared_index",
-		.field_bit_size = 4,
+		.description = "udp_sport",
+		.field_bit_size = 16,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
 		.field_opr1 = {
+			0xff,
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "shared_index",
-		.field_bit_size = 4,
+		.description = "udp_sport",
+		.field_bit_size = 16,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
 		.field_opr1 = {
-		(BNXT_ULP_ACT_PROP_IDX_SHARED_HANDLE >> 8) & 0xff,
-		BNXT_ULP_ACT_PROP_IDX_SHARED_HANDLE & 0xff}
+		(BNXT_ULP_ENC_FIELD_UDP_SPORT >> 8) & 0xff,
+		BNXT_ULP_ENC_FIELD_UDP_SPORT & 0xff}
 		}
 	},
-	/* act_tid: 7, , table: shared_mirror_record.rd */
 	{
 	.field_info_mask = {
-		.description = "shared_index",
-		.field_bit_size = 4,
+		.description = "udp_dport",
+		.field_bit_size = 16,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
 		.field_opr1 = {
+			0xff,
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "shared_index",
-		.field_bit_size = 4,
+		.description = "udp_dport",
+		.field_bit_size = 16,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
 		.field_opr1 = {
-		(BNXT_ULP_ACT_PROP_IDX_SHARED_HANDLE >> 8) & 0xff,
-		BNXT_ULP_ACT_PROP_IDX_SHARED_HANDLE & 0xff}
+		(BNXT_ULP_ENC_FIELD_UDP_DPORT >> 8) & 0xff,
+		BNXT_ULP_ENC_FIELD_UDP_DPORT & 0xff}
 		}
 	},
-	/* act_tid: 8, , table: shared_mirror_record.rd */
 	{
 	.field_info_mask = {
-		.description = "shared_index",
-		.field_bit_size = 4,
+		.description = "vni",
+		.field_bit_size = 24,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
 		.field_opr1 = {
+			0xff,
+			0xff,
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "shared_index",
-		.field_bit_size = 4,
+		.description = "vni",
+		.field_bit_size = 24,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
 		.field_opr1 = {
-		(BNXT_ULP_ACT_PROP_IDX_SHARED_HANDLE >> 8) & 0xff,
-		BNXT_ULP_ACT_PROP_IDX_SHARED_HANDLE & 0xff}
+		(BNXT_ULP_ENC_FIELD_VXLAN_VNI >> 8) & 0xff,
+		BNXT_ULP_ENC_FIELD_VXLAN_VNI & 0xff}
 		}
 	},
-	/* act_tid: 8, , table: source_property_cache.rd */
+	/* act_tid: 8, , table: vxlan_encap_ipv6_rec_cache.rd */
 	{
 	.field_info_mask = {
-		.description = "smac",
+		.description = "dmac",
 		.field_bit_size = 48,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
@@ -2645,85 +3130,111 @@ struct bnxt_ulp_mapper_key_info ulp_thor_act_key_info_list[] = {
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "smac",
+		.description = "dmac",
 		.field_bit_size = 48,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
 		.field_opr1 = {
-		(BNXT_ULP_ENC_FIELD_ETH_SMAC >> 8) & 0xff,
-		BNXT_ULP_ENC_FIELD_ETH_SMAC & 0xff}
+		(BNXT_ULP_ENC_FIELD_ETH_DMAC >> 8) & 0xff,
+		BNXT_ULP_ENC_FIELD_ETH_DMAC & 0xff}
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "ipv4_src_addr",
-		.field_bit_size = 32,
+		.description = "ipv6_dst_addr",
+		.field_bit_size = 128,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
 		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
 			0xff,
 			0xff,
 			0xff,
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "ipv4_src_addr",
-		.field_bit_size = 32,
+		.description = "ipv6_dst_addr",
+		.field_bit_size = 128,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
 		.field_opr1 = {
-		(BNXT_ULP_ENC_FIELD_IPV4_SADDR >> 8) & 0xff,
-		BNXT_ULP_ENC_FIELD_IPV4_SADDR & 0xff}
+		(BNXT_ULP_ENC_FIELD_IPV6_DADDR >> 8) & 0xff,
+		BNXT_ULP_ENC_FIELD_IPV6_DADDR & 0xff}
 		}
 	},
-	/* act_tid: 8, , table: source_property_cache.wr */
 	{
 	.field_info_mask = {
-		.description = "smac",
-		.field_bit_size = 48,
+		.description = "udp_sport",
+		.field_bit_size = 16,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
 		.field_opr1 = {
-			0xff,
-			0xff,
-			0xff,
-			0xff,
 			0xff,
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "smac",
-		.field_bit_size = 48,
+		.description = "udp_sport",
+		.field_bit_size = 16,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
 		.field_opr1 = {
-		(BNXT_ULP_ENC_FIELD_ETH_SMAC >> 8) & 0xff,
-		BNXT_ULP_ENC_FIELD_ETH_SMAC & 0xff}
+		(BNXT_ULP_ENC_FIELD_UDP_SPORT >> 8) & 0xff,
+		BNXT_ULP_ENC_FIELD_UDP_SPORT & 0xff}
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "ipv4_src_addr",
-		.field_bit_size = 32,
+		.description = "udp_dport",
+		.field_bit_size = 16,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
 		.field_opr1 = {
 			0xff,
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "udp_dport",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+		.field_opr1 = {
+		(BNXT_ULP_ENC_FIELD_UDP_DPORT >> 8) & 0xff,
+		BNXT_ULP_ENC_FIELD_UDP_DPORT & 0xff}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "vni",
+		.field_bit_size = 24,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
 			0xff,
 			0xff,
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "ipv4_src_addr",
-		.field_bit_size = 32,
+		.description = "vni",
+		.field_bit_size = 24,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
 		.field_opr1 = {
-		(BNXT_ULP_ENC_FIELD_IPV4_SADDR >> 8) & 0xff,
-		BNXT_ULP_ENC_FIELD_IPV4_SADDR & 0xff}
+		(BNXT_ULP_ENC_FIELD_VXLAN_VNI >> 8) & 0xff,
+		BNXT_ULP_ENC_FIELD_VXLAN_VNI & 0xff}
 		}
 	},
-	/* act_tid: 8, , table: vxlan_encap_rec_cache.rd */
+	/* act_tid: 8, , table: vxlan_encap_rec_cache.wr */
 	{
 	.field_info_mask = {
 		.description = "dmac",
@@ -2831,7 +3342,7 @@ struct bnxt_ulp_mapper_key_info ulp_thor_act_key_info_list[] = {
 		BNXT_ULP_ENC_FIELD_VXLAN_VNI & 0xff}
 		}
 	},
-	/* act_tid: 8, , table: vxlan_encap_rec_cache.wr */
+	/* act_tid: 8, , table: vxlan_encap_ipv6_rec_cache.wr */
 	{
 	.field_info_mask = {
 		.description = "dmac",
@@ -2858,24 +3369,36 @@ struct bnxt_ulp_mapper_key_info ulp_thor_act_key_info_list[] = {
 	},
 	{
 	.field_info_mask = {
-		.description = "ipv4_dst_addr",
-		.field_bit_size = 32,
+		.description = "ipv6_dst_addr",
+		.field_bit_size = 128,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
 		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
 			0xff,
 			0xff,
 			0xff,
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "ipv4_dst_addr",
-		.field_bit_size = 32,
+		.description = "ipv6_dst_addr",
+		.field_bit_size = 128,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
 		.field_opr1 = {
-		(BNXT_ULP_ENC_FIELD_IPV4_DADDR >> 8) & 0xff,
-		BNXT_ULP_ENC_FIELD_IPV4_DADDR & 0xff}
+		(BNXT_ULP_ENC_FIELD_IPV6_DADDR >> 8) & 0xff,
+		BNXT_ULP_ENC_FIELD_IPV6_DADDR & 0xff}
 		}
 	},
 	{
@@ -7256,6 +7779,25 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
+	/* act_tid: 8, , table: source_property_ipv6_cache.wr */
+	{
+	.description = "rid",
+	.field_bit_size = 32,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_RID >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_RID & 0xff}
+	},
+	{
+	.description = "sp_rec_ptr",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_MAIN_SP_PTR >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MAIN_SP_PTR & 0xff}
+	},
 	/* act_tid: 8, , table: mod_record.ing_l2write */
 	{
 	.description = "metadata_en",
@@ -7852,25 +8394,6 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {
 	(BNXT_ULP_ENC_FIELD_VXLAN_RSVD1 >> 8) & 0xff,
 	BNXT_ULP_ENC_FIELD_VXLAN_RSVD1 & 0xff}
 	},
-	/* act_tid: 8, , table: vxlan_encap_rec_cache.wr */
-	{
-	.description = "rid",
-	.field_bit_size = 32,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
-	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_RID >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_RID & 0xff}
-	},
-	{
-	.description = "enc_rec_ptr",
-	.field_bit_size = 16,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
-	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_ENCAP_PTR_0 >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_ENCAP_PTR_0 & 0xff}
-	},
 	/* act_tid: 8, , table: int_tun_encap_record.ipv6_vxlan */
 	{
 	.description = "ecv_valid",
@@ -8148,6 +8671,44 @@ struct bnxt_ulp_mapper_field_info ulp_thor_act_result_field_list[] = {
 	(BNXT_ULP_ENC_FIELD_VXLAN_RSVD1 >> 8) & 0xff,
 	BNXT_ULP_ENC_FIELD_VXLAN_RSVD1 & 0xff}
 	},
+	/* act_tid: 8, , table: vxlan_encap_rec_cache.wr */
+	{
+	.description = "rid",
+	.field_bit_size = 32,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_RID >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_RID & 0xff}
+	},
+	{
+	.description = "enc_rec_ptr",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_ENCAP_PTR_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_ENCAP_PTR_0 & 0xff}
+	},
+	/* act_tid: 8, , table: vxlan_encap_ipv6_rec_cache.wr */
+	{
+	.description = "rid",
+	.field_bit_size = 32,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_RID >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_RID & 0xff}
+	},
+	{
+	.description = "enc_rec_ptr",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_ENCAP_PTR_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_ENCAP_PTR_0 & 0xff}
+	},
 	/* act_tid: 8, , table: int_full_act_record.0 */
 	{
 	.description = "sp_rec_ptr",
@@ -9262,6 +9823,13 @@ struct bnxt_ulp_mapper_ident_info ulp_thor_act_ident_list[] = {
 	.ident_bit_size = 16,
 	.ident_bit_pos = 32
 	},
+	/* act_tid: 8, , table: source_property_ipv6_cache.rd */
+	{
+	.description = "sp_rec_ptr",
+	.regfile_idx = BNXT_ULP_RF_IDX_MAIN_SP_PTR,
+	.ident_bit_size = 16,
+	.ident_bit_pos = 32
+	},
 	/* act_tid: 8, , table: vxlan_encap_rec_cache.rd */
 	{
 	.description = "enc_rec_ptr",
@@ -9269,6 +9837,13 @@ struct bnxt_ulp_mapper_ident_info ulp_thor_act_ident_list[] = {
 	.ident_bit_size = 16,
 	.ident_bit_pos = 32
 	},
+	/* act_tid: 8, , table: vxlan_encap_ipv6_rec_cache.rd */
+	{
+	.description = "enc_rec_ptr",
+	.regfile_idx = BNXT_ULP_RF_IDX_ENCAP_PTR_0,
+	.ident_bit_size = 16,
+	.ident_bit_pos = 32
+	},
 	/* act_tid: 9, , table: shared_mirror_record.rd */
 	{
 	.description = "mirror_id",
diff --git a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_thor_class.c b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_thor_class.c
index 1a6c94f187..702da11d74 100644
--- a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_thor_class.c
+++ b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_thor_class.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2014-2023 Broadcom
+ * Copyright(c) 2014-2024 Broadcom
  * All rights reserved.
  */
 
@@ -213,8 +213,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
 	.key_start_idx = 35,
-	.blob_key_bit_size = 14,
-	.key_bit_size = 14,
+	.blob_key_bit_size = 15,
+	.key_bit_size = 15,
 	.key_num_fields = 3,
 	.ident_start_idx = 6,
 	.ident_nums = 4
@@ -311,8 +311,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
 	.key_start_idx = 81,
-	.blob_key_bit_size = 14,
-	.key_bit_size = 14,
+	.blob_key_bit_size = 15,
+	.key_bit_size = 15,
 	.key_num_fields = 3,
 	.result_start_idx = 124,
 	.result_bit_size = 138,
@@ -353,8 +353,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
 	.key_start_idx = 198,
-	.blob_key_bit_size = 14,
-	.key_bit_size = 14,
+	.blob_key_bit_size = 15,
+	.key_bit_size = 15,
 	.key_num_fields = 3,
 	.ident_start_idx = 11,
 	.ident_nums = 2
@@ -477,8 +477,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
 	.key_start_idx = 287,
-	.blob_key_bit_size = 14,
-	.key_bit_size = 14,
+	.blob_key_bit_size = 15,
+	.key_bit_size = 15,
 	.key_num_fields = 3,
 	.result_start_idx = 365,
 	.result_bit_size = 138,
@@ -879,8 +879,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
 	.key_start_idx = 1147,
-	.blob_key_bit_size = 14,
-	.key_bit_size = 14,
+	.blob_key_bit_size = 15,
+	.key_bit_size = 15,
 	.key_num_fields = 3,
 	.ident_start_idx = 19,
 	.ident_nums = 4
@@ -977,8 +977,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
 	.key_start_idx = 1193,
-	.blob_key_bit_size = 14,
-	.key_bit_size = 14,
+	.blob_key_bit_size = 15,
+	.key_bit_size = 15,
 	.key_num_fields = 3,
 	.result_start_idx = 540,
 	.result_bit_size = 138,
@@ -1020,8 +1020,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
 	.key_start_idx = 1310,
-	.blob_key_bit_size = 14,
-	.key_bit_size = 14,
+	.blob_key_bit_size = 15,
+	.key_bit_size = 15,
 	.key_num_fields = 3,
 	.ident_start_idx = 24,
 	.ident_nums = 3
@@ -1097,8 +1097,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
 	.key_start_idx = 1356,
-	.blob_key_bit_size = 14,
-	.key_bit_size = 14,
+	.blob_key_bit_size = 15,
+	.key_bit_size = 15,
 	.key_num_fields = 3,
 	.result_start_idx = 667,
 	.result_bit_size = 138,
@@ -1176,8 +1176,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
 	.key_start_idx = 1474,
-	.blob_key_bit_size = 14,
-	.key_bit_size = 14,
+	.blob_key_bit_size = 15,
+	.key_bit_size = 15,
 	.key_num_fields = 3,
 	.ident_start_idx = 28,
 	.ident_nums = 4
@@ -1274,8 +1274,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
 	.key_start_idx = 1520,
-	.blob_key_bit_size = 14,
-	.key_bit_size = 14,
+	.blob_key_bit_size = 15,
+	.key_bit_size = 15,
 	.key_num_fields = 3,
 	.result_start_idx = 793,
 	.result_bit_size = 138,
@@ -1316,8 +1316,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
 	.key_start_idx = 1637,
-	.blob_key_bit_size = 14,
-	.key_bit_size = 14,
+	.blob_key_bit_size = 15,
+	.key_bit_size = 15,
 	.key_num_fields = 3,
 	.ident_start_idx = 33,
 	.ident_nums = 2
@@ -1423,8 +1423,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
 	.key_start_idx = 1726,
-	.blob_key_bit_size = 14,
-	.key_bit_size = 14,
+	.blob_key_bit_size = 15,
+	.key_bit_size = 15,
 	.key_num_fields = 3,
 	.result_start_idx = 928,
 	.result_bit_size = 138,
@@ -1544,8 +1544,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.key_bit_size = 10,
 	.key_num_fields = 1,
 	.result_start_idx = 967,
-	.result_bit_size = 153,
-	.result_num_fields = 6
+	.result_bit_size = 179,
+	.result_num_fields = 8
 	},
 	{ /* class_tid: 4, , table: l2_cntxt_tcam_cache.ing_rd */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
@@ -1602,7 +1602,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.blob_key_bit_size = 213,
 	.key_bit_size = 213,
 	.key_num_fields = 21,
-	.result_start_idx = 973,
+	.result_start_idx = 975,
 	.result_bit_size = 43,
 	.result_num_fields = 6,
 	.ident_start_idx = 35,
@@ -1626,7 +1626,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.blob_key_bit_size = 11,
 	.key_bit_size = 11,
 	.key_num_fields = 1,
-	.result_start_idx = 979,
+	.result_start_idx = 981,
 	.result_bit_size = 62,
 	.result_num_fields = 4
 	},
@@ -1643,7 +1643,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.tbl_opcode = BNXT_ULP_IF_TBL_OPC_WR_COMP_FIELD,
 	.tbl_operand = BNXT_ULP_CF_IDX_PHY_PORT_PARIF,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
-	.result_start_idx = 983,
+	.result_start_idx = 985,
 	.result_bit_size = 32,
 	.result_num_fields = 1
 	},
@@ -1660,7 +1660,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.tbl_opcode = BNXT_ULP_IF_TBL_OPC_WR_COMP_FIELD,
 	.tbl_operand = BNXT_ULP_CF_IDX_PHY_PORT_PARIF,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
-	.result_start_idx = 984,
+	.result_start_idx = 986,
 	.result_bit_size = 32,
 	.result_num_fields = 1
 	},
@@ -1680,7 +1680,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
 	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-	.result_start_idx = 985,
+	.result_start_idx = 987,
 	.result_bit_size = 128,
 	.result_num_fields = 17,
 	.encap_num_fields = 0
@@ -1703,9 +1703,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.blob_key_bit_size = 10,
 	.key_bit_size = 10,
 	.key_num_fields = 1,
-	.result_start_idx = 1002,
-	.result_bit_size = 153,
-	.result_num_fields = 6
+	.result_start_idx = 1004,
+	.result_bit_size = 179,
+	.result_num_fields = 8
 	},
 	{ /* class_tid: 4, , table: control.egr_0 */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
@@ -1765,7 +1765,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.tbl_operand = BNXT_ULP_CF_IDX_DRV_FUNC_SVIF,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
 	.fdb_operand = BNXT_ULP_RF_IDX_RID,
-	.result_start_idx = 1008,
+	.result_start_idx = 1012,
 	.result_bit_size = 64,
 	.result_num_fields = 8
 	},
@@ -1787,7 +1787,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.blob_key_bit_size = 11,
 	.key_bit_size = 11,
 	.key_num_fields = 1,
-	.result_start_idx = 1016,
+	.result_start_idx = 1020,
 	.result_bit_size = 62,
 	.result_num_fields = 4
 	},
@@ -1844,7 +1844,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.blob_key_bit_size = 213,
 	.key_bit_size = 213,
 	.key_num_fields = 21,
-	.result_start_idx = 1020,
+	.result_start_idx = 1024,
 	.result_bit_size = 43,
 	.result_num_fields = 6,
 	.ident_start_idx = 36,
@@ -1868,7 +1868,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.blob_key_bit_size = 11,
 	.key_bit_size = 11,
 	.key_num_fields = 1,
-	.result_start_idx = 1026,
+	.result_start_idx = 1030,
 	.result_bit_size = 62,
 	.result_num_fields = 4
 	},
@@ -1885,7 +1885,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.tbl_opcode = BNXT_ULP_IF_TBL_OPC_WR_COMP_FIELD,
 	.tbl_operand = BNXT_ULP_CF_IDX_DRV_FUNC_PARIF,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 1030,
+	.result_start_idx = 1034,
 	.result_bit_size = 32,
 	.result_num_fields = 1
 	},
@@ -1902,7 +1902,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.tbl_opcode = BNXT_ULP_IF_TBL_OPC_WR_COMP_FIELD,
 	.tbl_operand = BNXT_ULP_CF_IDX_DRV_FUNC_PARIF,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 1031,
+	.result_start_idx = 1035,
 	.result_bit_size = 32,
 	.result_num_fields = 1
 	},
@@ -1922,8 +1922,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
 	.key_start_idx = 2121,
-	.blob_key_bit_size = 14,
-	.key_bit_size = 14,
+	.blob_key_bit_size = 15,
+	.key_bit_size = 15,
 	.key_num_fields = 3,
 	.ident_start_idx = 37,
 	.ident_nums = 0
@@ -1955,7 +1955,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_WR_GLB_REGFILE,
 	.tbl_operand = BNXT_ULP_GLB_RF_IDX_GLB_MODIFY_PTR,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
-	.result_start_idx = 1032,
+	.result_start_idx = 1036,
 	.result_bit_size = 0,
 	.result_num_fields = 0,
 	.encap_num_fields = 47
@@ -1976,7 +1976,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.tbl_operand = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
 	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-	.result_start_idx = 1079,
+	.result_start_idx = 1083,
 	.result_bit_size = 128,
 	.result_num_fields = 17,
 	.encap_num_fields = 0
@@ -1995,7 +1995,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.tbl_operand = ULP_THOR_SYM_LOOPBACK_PARIF,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
 	.fdb_operand = BNXT_ULP_RF_IDX_RID,
-	.result_start_idx = 1096,
+	.result_start_idx = 1100,
 	.result_bit_size = 32,
 	.result_num_fields = 1
 	},
@@ -2013,7 +2013,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.tbl_operand = ULP_THOR_SYM_LOOPBACK_PARIF,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
 	.fdb_operand = BNXT_ULP_RF_IDX_RID,
-	.result_start_idx = 1097,
+	.result_start_idx = 1101,
 	.result_bit_size = 32,
 	.result_num_fields = 1
 	},
@@ -2033,10 +2033,10 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
 	.key_start_idx = 2124,
-	.blob_key_bit_size = 14,
-	.key_bit_size = 14,
+	.blob_key_bit_size = 15,
+	.key_bit_size = 15,
 	.key_num_fields = 3,
-	.result_start_idx = 1098,
+	.result_start_idx = 1102,
 	.result_bit_size = 138,
 	.result_num_fields = 7
 	},
@@ -2093,7 +2093,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.blob_key_bit_size = 213,
 	.key_bit_size = 213,
 	.key_num_fields = 21,
-	.result_start_idx = 1105,
+	.result_start_idx = 1109,
 	.result_bit_size = 43,
 	.result_num_fields = 6,
 	.ident_start_idx = 37,
@@ -2117,7 +2117,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.blob_key_bit_size = 11,
 	.key_bit_size = 11,
 	.key_num_fields = 1,
-	.result_start_idx = 1111,
+	.result_start_idx = 1115,
 	.result_bit_size = 62,
 	.result_num_fields = 4
 	},
@@ -2137,7 +2137,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
 	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_AND_SET_VFR_FLAG,
-	.result_start_idx = 1115,
+	.result_start_idx = 1119,
 	.result_bit_size = 128,
 	.result_num_fields = 17
 	},
@@ -2157,8 +2157,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
 	.key_start_idx = 2150,
-	.blob_key_bit_size = 14,
-	.key_bit_size = 14,
+	.blob_key_bit_size = 15,
+	.key_bit_size = 15,
 	.key_num_fields = 3,
 	.ident_start_idx = 38,
 	.ident_nums = 0
@@ -2191,7 +2191,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.tbl_operand = BNXT_ULP_GLB_RF_IDX_GLB_DROP_AREC_PTR,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
 	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-	.result_start_idx = 1132,
+	.result_start_idx = 1136,
 	.result_bit_size = 128,
 	.result_num_fields = 17,
 	.encap_num_fields = 0
@@ -2218,7 +2218,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.blob_key_bit_size = 213,
 	.key_bit_size = 213,
 	.key_num_fields = 21,
-	.result_start_idx = 1149,
+	.result_start_idx = 1153,
 	.result_bit_size = 43,
 	.result_num_fields = 6,
 	.ident_start_idx = 38,
@@ -2246,7 +2246,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.blob_key_bit_size = 213,
 	.key_bit_size = 213,
 	.key_num_fields = 21,
-	.result_start_idx = 1155,
+	.result_start_idx = 1159,
 	.result_bit_size = 43,
 	.result_num_fields = 6,
 	.ident_start_idx = 38,
@@ -2265,7 +2265,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_WR_GLB_REGFILE,
 	.tbl_operand = BNXT_ULP_GLB_RF_IDX_GLB_VFR_EM_KEY_ID_0,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
-	.result_start_idx = 1161,
+	.result_start_idx = 1165,
 	.result_bit_size = 106,
 	.result_num_fields = 106
 	},
@@ -2282,7 +2282,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_WR_GLB_REGFILE,
 	.tbl_operand = BNXT_ULP_GLB_RF_IDX_GLB_VFR_EM_KEY_ID_1,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
-	.result_start_idx = 1267,
+	.result_start_idx = 1271,
 	.result_bit_size = 106,
 	.result_num_fields = 106
 	},
@@ -2308,7 +2308,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.blob_key_bit_size = 94,
 	.key_bit_size = 94,
 	.key_num_fields = 43,
-	.result_start_idx = 1373,
+	.result_start_idx = 1377,
 	.result_bit_size = 33,
 	.result_num_fields = 8
 	},
@@ -2334,7 +2334,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.blob_key_bit_size = 94,
 	.key_bit_size = 94,
 	.key_num_fields = 43,
-	.result_start_idx = 1381,
+	.result_start_idx = 1385,
 	.result_bit_size = 33,
 	.result_num_fields = 8
 	},
@@ -2354,10 +2354,10 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
 	.key_start_idx = 2281,
-	.blob_key_bit_size = 14,
-	.key_bit_size = 14,
+	.blob_key_bit_size = 15,
+	.key_bit_size = 15,
 	.key_num_fields = 3,
-	.result_start_idx = 1389,
+	.result_start_idx = 1393,
 	.result_bit_size = 138,
 	.result_num_fields = 7
 	},
@@ -2374,7 +2374,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.tbl_opcode = BNXT_ULP_IF_TBL_OPC_WR_COMP_FIELD,
 	.tbl_operand = BNXT_ULP_CF_IDX_VF_FUNC_SVIF,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 1396,
+	.result_start_idx = 1400,
 	.result_bit_size = 64,
 	.result_num_fields = 8
 	},
@@ -2394,7 +2394,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.blob_key_bit_size = 0,
 	.key_bit_size = 0,
 	.key_num_fields = 114,
-	.result_start_idx = 1404,
+	.result_start_idx = 1408,
 	.result_bit_size = 0,
 	.result_num_fields = 6
 	},
@@ -2446,7 +2446,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.tbl_operand = BNXT_ULP_CF_IDX_DRV_FUNC_SVIF,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
 	.fdb_operand = BNXT_ULP_RF_IDX_RID,
-	.result_start_idx = 1410,
+	.result_start_idx = 1414,
 	.result_bit_size = 64,
 	.result_num_fields = 8
 	},
@@ -2468,7 +2468,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.blob_key_bit_size = 11,
 	.key_bit_size = 11,
 	.key_num_fields = 1,
-	.result_start_idx = 1418,
+	.result_start_idx = 1422,
 	.result_bit_size = 62,
 	.result_num_fields = 4
 	},
@@ -2485,7 +2485,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.tbl_opcode = BNXT_ULP_IF_TBL_OPC_WR_COMP_FIELD,
 	.tbl_operand = BNXT_ULP_CF_IDX_VF_FUNC_SVIF,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 1422,
+	.result_start_idx = 1426,
 	.result_bit_size = 64,
 	.result_num_fields = 8
 	},
@@ -2504,7 +2504,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_MODIFY_PTR,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 1430,
+	.result_start_idx = 1434,
 	.result_bit_size = 0,
 	.result_num_fields = 0,
 	.encap_num_fields = 47
@@ -2525,7 +2525,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
 	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-	.result_start_idx = 1477,
+	.result_start_idx = 1481,
 	.result_bit_size = 128,
 	.result_num_fields = 17
 	},
@@ -2545,7 +2545,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
 	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-	.result_start_idx = 1494,
+	.result_start_idx = 1498,
 	.result_bit_size = 128,
 	.result_num_fields = 17
 	},
@@ -2565,7 +2565,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_thor_class_tbl_list[] = {
 	.blob_key_bit_size = 0,
 	.key_bit_size = 0,
 	.key_num_fields = 114,
-	.result_start_idx = 1511,
+	.result_start_idx = 1515,
 	.result_bit_size = 0,
 	.result_num_fields = 6
 	}
@@ -3442,7 +3442,7 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {
 	{
 	.field_info_mask = {
 		.description = "hdr_sig_id",
-		.field_bit_size = 5,
+		.field_bit_size = 6,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
 		.field_opr1 = {
@@ -3450,7 +3450,7 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {
 		},
 	.field_info_spec = {
 		.description = "hdr_sig_id",
-		.field_bit_size = 5,
+		.field_bit_size = 6,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
 		.field_opr1 = {
@@ -4180,7 +4180,7 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {
 	{
 	.field_info_mask = {
 		.description = "hdr_sig_id",
-		.field_bit_size = 5,
+		.field_bit_size = 6,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
 		.field_opr1 = {
@@ -4188,7 +4188,7 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {
 		},
 	.field_info_spec = {
 		.description = "hdr_sig_id",
-		.field_bit_size = 5,
+		.field_bit_size = 6,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
 		.field_opr1 = {
@@ -5735,7 +5735,7 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {
 	{
 	.field_info_mask = {
 		.description = "hdr_sig_id",
-		.field_bit_size = 5,
+		.field_bit_size = 6,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
 		.field_opr1 = {
@@ -5743,7 +5743,7 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {
 		},
 	.field_info_spec = {
 		.description = "hdr_sig_id",
-		.field_bit_size = 5,
+		.field_bit_size = 6,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
 		.field_opr1 = {
@@ -7191,7 +7191,7 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {
 	{
 	.field_info_mask = {
 		.description = "hdr_sig_id",
-		.field_bit_size = 5,
+		.field_bit_size = 6,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
 		.field_opr1 = {
@@ -7199,7 +7199,7 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {
 		},
 	.field_info_spec = {
 		.description = "hdr_sig_id",
-		.field_bit_size = 5,
+		.field_bit_size = 6,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
 		.field_opr1 = {
@@ -18565,7 +18565,7 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {
 	{
 	.field_info_mask = {
 		.description = "hdr_sig_id",
-		.field_bit_size = 5,
+		.field_bit_size = 6,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
 		.field_opr1 = {
@@ -18573,7 +18573,7 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {
 		},
 	.field_info_spec = {
 		.description = "hdr_sig_id",
-		.field_bit_size = 5,
+		.field_bit_size = 6,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
 		.field_opr1 = {
@@ -19326,7 +19326,7 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {
 	{
 	.field_info_mask = {
 		.description = "hdr_sig_id",
-		.field_bit_size = 5,
+		.field_bit_size = 6,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
 		.field_opr1 = {
@@ -19334,7 +19334,7 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {
 		},
 	.field_info_spec = {
 		.description = "hdr_sig_id",
-		.field_bit_size = 5,
+		.field_bit_size = 6,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
 		.field_opr1 = {
@@ -20893,7 +20893,7 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {
 	{
 	.field_info_mask = {
 		.description = "hdr_sig_id",
-		.field_bit_size = 5,
+		.field_bit_size = 6,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
 		.field_opr1 = {
@@ -20901,7 +20901,7 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {
 		},
 	.field_info_spec = {
 		.description = "hdr_sig_id",
-		.field_bit_size = 5,
+		.field_bit_size = 6,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
 		.field_opr1 = {
@@ -21623,7 +21623,7 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {
 	{
 	.field_info_mask = {
 		.description = "hdr_sig_id",
-		.field_bit_size = 5,
+		.field_bit_size = 6,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
 		.field_opr1 = {
@@ -21631,7 +21631,7 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {
 		},
 	.field_info_spec = {
 		.description = "hdr_sig_id",
-		.field_bit_size = 5,
+		.field_bit_size = 6,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
 		.field_opr1 = {
@@ -23236,7 +23236,7 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {
 	{
 	.field_info_mask = {
 		.description = "hdr_sig_id",
-		.field_bit_size = 5,
+		.field_bit_size = 6,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
 		.field_opr1 = {
@@ -23244,7 +23244,7 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {
 		},
 	.field_info_spec = {
 		.description = "hdr_sig_id",
-		.field_bit_size = 5,
+		.field_bit_size = 6,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
 		.field_opr1 = {
@@ -23958,7 +23958,7 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {
 	{
 	.field_info_mask = {
 		.description = "hdr_sig_id",
-		.field_bit_size = 5,
+		.field_bit_size = 6,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
 		.field_opr1 = {
@@ -23966,7 +23966,7 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {
 		},
 	.field_info_spec = {
 		.description = "hdr_sig_id",
-		.field_bit_size = 5,
+		.field_bit_size = 6,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
 		.field_opr1 = {
@@ -25523,7 +25523,7 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {
 	{
 	.field_info_mask = {
 		.description = "hdr_sig_id",
-		.field_bit_size = 5,
+		.field_bit_size = 6,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
 		.field_opr1 = {
@@ -25531,7 +25531,7 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {
 		},
 	.field_info_spec = {
 		.description = "hdr_sig_id",
-		.field_bit_size = 5,
+		.field_bit_size = 6,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
 		.field_opr1 = {
@@ -26903,7 +26903,7 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {
 	{
 	.field_info_mask = {
 		.description = "hdr_sig_id",
-		.field_bit_size = 5,
+		.field_bit_size = 6,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
 		.field_opr1 = {
@@ -26911,7 +26911,7 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {
 		},
 	.field_info_spec = {
 		.description = "hdr_sig_id",
-		.field_bit_size = 5,
+		.field_bit_size = 6,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
 		.field_opr1 = {
@@ -32164,13 +32164,13 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {
 	{
 	.field_info_mask = {
 		.description = "hdr_sig_id",
-		.field_bit_size = 5,
+		.field_bit_size = 6,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "hdr_sig_id",
-		.field_bit_size = 5,
+		.field_bit_size = 6,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
@@ -32216,13 +32216,13 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {
 	{
 	.field_info_mask = {
 		.description = "hdr_sig_id",
-		.field_bit_size = 5,
+		.field_bit_size = 6,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "hdr_sig_id",
-		.field_bit_size = 5,
+		.field_bit_size = 6,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
@@ -32613,13 +32613,13 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {
 	{
 	.field_info_mask = {
 		.description = "hdr_sig_id",
-		.field_bit_size = 5,
+		.field_bit_size = 6,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "hdr_sig_id",
-		.field_bit_size = 5,
+		.field_bit_size = 6,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
@@ -34505,13 +34505,13 @@ struct bnxt_ulp_mapper_key_info ulp_thor_class_key_info_list[] = {
 	{
 	.field_info_mask = {
 		.description = "hdr_sig_id",
-		.field_bit_size = 5,
+		.field_bit_size = 6,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "hdr_sig_id",
-		.field_bit_size = 5,
+		.field_bit_size = 6,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
@@ -43701,6 +43701,18 @@ struct bnxt_ulp_mapper_field_info ulp_thor_class_result_field_list[] = {
 	(BNXT_ULP_RF_IDX_DEFAULT_AREC_PTR >> 8) & 0xff,
 	BNXT_ULP_RF_IDX_DEFAULT_AREC_PTR & 0xff}
 	},
+	{
+	.description = "l2_cntxt_id",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "sp_rec_ptr",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
 	/* class_tid: 4, , table: l2_cntxt_tcam.ing_0 */
 	{
 	.description = "prof_func_id",
@@ -43956,6 +43968,18 @@ struct bnxt_ulp_mapper_field_info ulp_thor_class_result_field_list[] = {
 	(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
 	BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
 	},
+	{
+	.description = "l2_cntxt_id",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "sp_rec_ptr",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
 	/* class_tid: 4, , table: ilt_tbl.egr_vfr */
 	{
 	.description = "ilt_destination",
@@ -47467,3 +47491,4 @@ struct bnxt_ulp_mapper_ident_info ulp_thor_class_ident_list[] = {
 	.ident_bit_pos = 29
 	}
 };
+
diff --git a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_wh_plus_act.c b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_wh_plus_act.c
index 2a499c0ba2..97bf617a78 100644
--- a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_wh_plus_act.c
+++ b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_wh_plus_act.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2014-2023 Broadcom
+ * Copyright(c) 2014-2024 Broadcom
  * All rights reserved.
  */
 
@@ -13,7 +13,7 @@ struct bnxt_ulp_mapper_tmpl_info ulp_wh_plus_act_tmpl_list[] = {
 	/* act_tid: 1, ingress */
 	[1] = {
 	.device_name = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.num_tbls = 5,
+	.num_tbls = 21,
 	.start_tbl_idx = 0,
 	.reject_info = {
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_OR,
@@ -24,85 +24,101 @@ struct bnxt_ulp_mapper_tmpl_info ulp_wh_plus_act_tmpl_list[] = {
 	[2] = {
 	.device_name = BNXT_ULP_DEVICE_ID_WH_PLUS,
 	.num_tbls = 7,
-	.start_tbl_idx = 5,
+	.start_tbl_idx = 21,
 	.reject_info = {
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_FALSE,
-		.cond_start_idx = 17,
+		.cond_start_idx = 24,
 		.cond_nums = 0 }
 	},
 	/* act_tid: 3, ingress */
 	[3] = {
 	.device_name = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.num_tbls = 7,
-	.start_tbl_idx = 12,
+	.num_tbls = 22,
+	.start_tbl_idx = 28,
 	.reject_info = {
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_OR,
-		.cond_start_idx = 18,
+		.cond_start_idx = 27,
 		.cond_nums = 3 }
 	},
 	/* act_tid: 4, ingress */
 	[4] = {
 	.device_name = BNXT_ULP_DEVICE_ID_WH_PLUS,
 	.num_tbls = 5,
-	.start_tbl_idx = 19,
+	.start_tbl_idx = 50,
 	.reject_info = {
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_OR,
-		.cond_start_idx = 29,
+		.cond_start_idx = 44,
 		.cond_nums = 1 }
 	},
 	/* act_tid: 5, ingress */
 	[5] = {
 	.device_name = BNXT_ULP_DEVICE_ID_WH_PLUS,
 	.num_tbls = 1,
-	.start_tbl_idx = 24,
+	.start_tbl_idx = 55,
 	.reject_info = {
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_FALSE,
-		.cond_start_idx = 35,
+		.cond_start_idx = 50,
 		.cond_nums = 0 }
 	},
 	/* act_tid: 6, egress */
 	[6] = {
 	.device_name = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.num_tbls = 5,
-	.start_tbl_idx = 25,
+	.num_tbls = 23,
+	.start_tbl_idx = 56,
 	.reject_info = {
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_FALSE,
-		.cond_start_idx = 35,
+		.cond_start_idx = 50,
 		.cond_nums = 0 }
 	},
 	/* act_tid: 7, egress */
 	[7] = {
 	.device_name = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.num_tbls = 7,
-	.start_tbl_idx = 30,
+	.num_tbls = 25,
+	.start_tbl_idx = 79,
 	.reject_info = {
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_OR,
-		.cond_start_idx = 43,
-		.cond_nums = 3 }
+		.cond_start_idx = 66,
+		.cond_nums = 2 }
 	},
 	/* act_tid: 8, egress */
 	[8] = {
 	.device_name = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.num_tbls = 6,
-	.start_tbl_idx = 37,
+	.num_tbls = 30,
+	.start_tbl_idx = 104,
 	.reject_info = {
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_OR,
-		.cond_start_idx = 54,
-		.cond_nums = 3 }
+		.cond_start_idx = 84,
+		.cond_nums = 2 }
 	},
 	/* act_tid: 9, egress */
 	[9] = {
 	.device_name = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.num_tbls = 3,
-	.start_tbl_idx = 43,
+	.num_tbls = 20,
+	.start_tbl_idx = 134,
 	.reject_info = {
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_FALSE,
-		.cond_start_idx = 63,
+		.cond_start_idx = 111,
 		.cond_nums = 0 }
 	}
 };
 
 struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
+	{ /* act_tid: 1, , table: control.set_dest_vnic_default */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_RX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 12,
+		.cond_nums = 0 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
+	.func_info = {
+		.func_opc = BNXT_ULP_FUNC_OPC_COPY_SRC1_TO_RF,
+		.func_src1 = BNXT_ULP_FUNC_SRC_COMP_FIELD,
+		.func_opr1 = BNXT_ULP_CF_IDX_MP_VNIC_A,
+		.func_dst_opr = BNXT_ULP_RF_IDX_DEST_VNIC }
+	},
 	{ /* act_tid: 1, , table: shared_mirror_record.rd */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
 	.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,
@@ -111,7 +127,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
 	.direction = TF_DIR_RX,
 	.execute_info = {
 		.cond_true_goto  = 1,
-		.cond_false_goto = 1,
+		.cond_false_goto = 2,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
 		.cond_start_idx = 12,
 		.cond_nums = 1 },
@@ -119,97 +135,122 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
 	.key_start_idx = 0,
-	.blob_key_bit_size = 1,
-	.key_bit_size = 1,
+	.blob_key_bit_size = 4,
+	.key_bit_size = 4,
 	.key_num_fields = 1,
 	.ident_start_idx = 0,
 	.ident_nums = 1
 	},
-	{ /* act_tid: 1, , table: int_flow_counter_tbl.0 */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type = TF_TBL_TYPE_ACT_STATS_64,
-	.resource_sub_type =
-		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT,
+	{ /* act_tid: 1, , table: control.mirror_ing_0 */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
 	.direction = TF_DIR_RX,
 	.execute_info = {
-		.cond_true_goto  = 1,
-		.cond_false_goto = 1,
+		.cond_true_goto  = 1023,
+		.cond_false_goto = 15,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
 		.cond_start_idx = 13,
 		.cond_nums = 1 },
-	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-	.result_start_idx = 0,
-	.result_bit_size = 64,
-	.result_num_fields = 1
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP
 	},
-	{ /* act_tid: 1, , table: int_vtag_encap_record.0 */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type = TF_TBL_TYPE_ACT_ENCAP_8B,
+	{ /* act_tid: 1, , table: multi_shared_mirror_record.rd_a */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
+	.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,
 	.resource_sub_type =
-		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
+		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_MULTI_SHARED_MIRROR,
 	.direction = TF_DIR_RX,
 	.execute_info = {
 		.cond_true_goto  = 1,
-		.cond_false_goto = 1,
+		.cond_false_goto = 14,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
 		.cond_start_idx = 14,
 		.cond_nums = 1 },
-	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_ENCAP_PTR_0,
+	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
+	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-	.record_size = 8,
-	.result_start_idx = 1,
-	.result_bit_size = 0,
-	.result_num_fields = 0,
-	.encap_num_fields = 11
+	.key_start_idx = 1,
+	.blob_key_bit_size = 8,
+	.key_bit_size = 8,
+	.key_num_fields = 1,
+	.ident_start_idx = 1,
+	.ident_nums = 1
 	},
-	{ /* act_tid: 1, , table: int_full_act_record.0 */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.resource_sub_type =
-		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
+	{ /* act_tid: 1, , table: control.mirror_port_a */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
 	.direction = TF_DIR_RX,
 	.execute_info = {
-		.cond_true_goto  = 1,
+		.cond_true_goto  = 2,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
 		.cond_start_idx = 15,
 		.cond_nums = 1 },
-	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-	.result_start_idx = 12,
-	.result_bit_size = 128,
-	.result_num_fields = 26,
-	.encap_num_fields = 0
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP
 	},
-	{ /* act_tid: 1, , table: ext_full_act_record.0 */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type = TF_TBL_TYPE_EXT,
+	{ /* act_tid: 1, , table: control.set_dest_vnic_b */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_RX,
+	.execute_info = {
+		.cond_true_goto  = 12,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 16,
+		.cond_nums = 0 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
+	.func_info = {
+		.func_opc = BNXT_ULP_FUNC_OPC_COPY_SRC1_TO_RF,
+		.func_src1 = BNXT_ULP_FUNC_SRC_COMP_FIELD,
+		.func_opr1 = BNXT_ULP_CF_IDX_MP_VNIC_B,
+		.func_dst_opr = BNXT_ULP_RF_IDX_DEST_VNIC }
+	},
+	{ /* act_tid: 1, , table: multi_shared_mirror_record.rd_b */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
+	.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,
 	.resource_sub_type =
-		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
+		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_MULTI_SHARED_MIRROR,
 	.direction = TF_DIR_RX,
 	.execute_info = {
-		.cond_true_goto  = 0,
-		.cond_false_goto = 0,
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 16,
+		.cond_nums = 0 },
+	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
+	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.key_start_idx = 2,
+	.blob_key_bit_size = 8,
+	.key_bit_size = 8,
+	.key_num_fields = 1,
+	.ident_start_idx = 2,
+	.ident_nums = 1
+	},
+	{ /* act_tid: 1, , table: control.mirror_port_b */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_RX,
+	.execute_info = {
+		.cond_true_goto  = 2,
+		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
 		.cond_start_idx = 16,
 		.cond_nums = 1 },
-	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-	.result_start_idx = 38,
-	.result_bit_size = 128,
-	.result_num_fields = 26,
-	.encap_num_fields = 11
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP
 	},
-	{ /* act_tid: 2, , table: control.0 */
+	{ /* act_tid: 1, , table: control.set_dest_vnic_a */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_RX,
+	.execute_info = {
+		.cond_true_goto  = 9,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 17,
+		.cond_nums = 0 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
+	.func_info = {
+		.func_opc = BNXT_ULP_FUNC_OPC_COPY_SRC1_TO_RF,
+		.func_src1 = BNXT_ULP_FUNC_SRC_COMP_FIELD,
+		.func_opr1 = BNXT_ULP_CF_IDX_MP_VNIC_A,
+		.func_dst_opr = BNXT_ULP_RF_IDX_DEST_VNIC }
+	},
+	{ /* act_tid: 1, , table: control.mirror */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
 	.direction = TF_DIR_RX,
 	.execute_info = {
@@ -221,7 +262,7 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
 	.fdb_opcode = BNXT_ULP_FDB_OPC_ALLOC_RID_REGFILE,
 	.fdb_operand = BNXT_ULP_RF_IDX_RID
 	},
-	{ /* act_tid: 2, , table: mirror_tbl.alloc */
+	{ /* act_tid: 1, , table: mirror_tbl.alloc */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
 	.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,
 	.resource_sub_type =
@@ -238,11 +279,11 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
 	.fdb_operand = BNXT_ULP_RF_IDX_RID,
 	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-	.result_start_idx = 75,
+	.result_start_idx = 0,
 	.result_bit_size = 32,
 	.result_num_fields = 6
 	},
-	{ /* act_tid: 2, , table: int_flow_counter_tbl.0 */
+	{ /* act_tid: 1, , table: int_flow_counter_tbl.mirror */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
 	.resource_type = TF_TBL_TYPE_ACT_STATS_64,
 	.resource_sub_type =
@@ -255,15 +296,15 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
 		.cond_start_idx = 17,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0,
+	.tbl_operand = BNXT_ULP_RF_IDX_MIRR_FLOW_CNTR_PTR_0,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
 	.fdb_operand = BNXT_ULP_RF_IDX_RID,
 	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-	.result_start_idx = 81,
+	.result_start_idx = 6,
 	.result_bit_size = 64,
 	.result_num_fields = 1
 	},
-	{ /* act_tid: 2, , table: int_full_act_record.0 */
+	{ /* act_tid: 1, , table: int_full_act_record.mirror */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
 	.resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
 	.resource_sub_type =
@@ -272,20 +313,20 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
 	.execute_info = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
 		.cond_start_idx = 18,
-		.cond_nums = 0 },
+		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
+	.tbl_operand = BNXT_ULP_RF_IDX_MIRR_ACTION_PTR,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
 	.fdb_operand = BNXT_ULP_RF_IDX_RID,
 	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-	.result_start_idx = 82,
+	.result_start_idx = 7,
 	.result_bit_size = 128,
 	.result_num_fields = 26,
 	.encap_num_fields = 0
 	},
-	{ /* act_tid: 2, , table: ext_full_act_record.0 */
+	{ /* act_tid: 1, , table: ext_full_act_record.mirror */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
 	.resource_type = TF_TBL_TYPE_EXT,
 	.resource_sub_type =
@@ -294,20 +335,20 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
 	.execute_info = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 18,
-		.cond_nums = 0 },
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 19,
+		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
+	.tbl_operand = BNXT_ULP_RF_IDX_MIRR_ACTION_PTR,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
 	.fdb_operand = BNXT_ULP_RF_IDX_RID,
 	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-	.result_start_idx = 108,
+	.result_start_idx = 33,
 	.result_bit_size = 128,
 	.result_num_fields = 26,
 	.encap_num_fields = 11
 	},
-	{ /* act_tid: 2, , table: mirror_tbl.wr */
+	{ /* act_tid: 1, , table: mirror_tbl.wr */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
 	.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,
 	.resource_sub_type =
@@ -317,51 +358,58 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 18,
+		.cond_start_idx = 20,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_MIRROR_PTR_0,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
 	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-	.result_start_idx = 145,
+	.result_start_idx = 70,
 	.result_bit_size = 32,
 	.result_num_fields = 6
 	},
-	{ /* act_tid: 2, , table: shared_mirror_record.wr */
+	{ /* act_tid: 1, , table: control.inc_mirror_id */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_RX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 20,
+		.cond_nums = 0 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
+	.func_info = {
+		.func_opc = BNXT_ULP_FUNC_OPC_ADD,
+		.func_src1 = BNXT_ULP_FUNC_SRC_REGFILE,
+		.func_opr1 = BNXT_ULP_RF_IDX_MIRROR_PTR_0,
+		.func_src2 = BNXT_ULP_FUNC_SRC_CONST,
+		.func_opr2 = 1,
+		.func_dst_opr = BNXT_ULP_RF_IDX_MIRROR_ID_0 }
+	},
+	{ /* act_tid: 1, , table: multi_shared_mirror_record.wr_b */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
 	.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,
 	.resource_sub_type =
-		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_SHARED_MIRROR,
+		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_MULTI_SHARED_MIRROR,
 	.direction = TF_DIR_RX,
 	.execute_info = {
-		.cond_true_goto  = 0,
-		.cond_false_goto = 0,
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 18,
+		.cond_start_idx = 20,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_WRITE,
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
-	.key_start_idx = 1,
-	.blob_key_bit_size = 1,
-	.key_bit_size = 1,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.key_start_idx = 3,
+	.blob_key_bit_size = 8,
+	.key_bit_size = 8,
 	.key_num_fields = 1,
-	.result_start_idx = 151,
-	.result_bit_size = 34,
+	.result_start_idx = 76,
+	.result_bit_size = 36,
 	.result_num_fields = 2
 	},
-	{ /* act_tid: 3, , table: control.0 */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
-	.direction = TF_DIR_RX,
-	.execute_info = {
-		.cond_true_goto  = 1023,
-		.cond_false_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 21,
-		.cond_nums = 3 },
-	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP
-	},
-	{ /* act_tid: 3, , table: int_flow_counter_tbl.0 */
+	{ /* act_tid: 1, , table: int_flow_counter_tbl.0 */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
 	.resource_type = TF_TBL_TYPE_ACT_STATS_64,
 	.resource_sub_type =
@@ -371,37 +419,19 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 24,
+		.cond_start_idx = 20,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 153,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.result_start_idx = 78,
 	.result_bit_size = 64,
 	.result_num_fields = 1
 	},
-	{ /* act_tid: 3, , table: act_modify_ipv4_src.0 */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type = TF_TBL_TYPE_ACT_MODIFY_IPV4,
-	.resource_sub_type =
-		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
-	.direction = TF_DIR_RX,
-	.execute_info = {
-		.cond_true_goto  = 1,
-		.cond_false_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 25,
-		.cond_nums = 1 },
-	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 154,
-	.result_bit_size = 32,
-	.result_num_fields = 1
-	},
-	{ /* act_tid: 3, , table: act_modify_ipv4_dst.0 */
+	{ /* act_tid: 1, , table: int_vtag_encap_record.0 */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type = TF_TBL_TYPE_ACT_MODIFY_IPV4,
+	.resource_type = TF_TBL_TYPE_ACT_ENCAP_8B,
 	.resource_sub_type =
 		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
 	.direction = TF_DIR_RX,
@@ -409,37 +439,19 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 26,
+		.cond_start_idx = 21,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0,
+	.tbl_operand = BNXT_ULP_RF_IDX_ENCAP_PTR_0,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 155,
-	.result_bit_size = 32,
-	.result_num_fields = 1
-	},
-	{ /* act_tid: 3, , table: int_encap_vlan_record.0 */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.resource_sub_type =
-		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
-	.direction = TF_DIR_RX,
-	.execute_info = {
-		.cond_true_goto  = 1,
-		.cond_false_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 27,
-		.cond_nums = 0 },
-	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_WR_GLB_REGFILE,
-	.tbl_operand = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
-	.record_size = 16,
-	.result_start_idx = 156,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.record_size = 8,
+	.result_start_idx = 79,
 	.result_bit_size = 0,
 	.result_num_fields = 0,
 	.encap_num_fields = 11
 	},
-	{ /* act_tid: 3, , table: int_full_act_record.0 */
+	{ /* act_tid: 1, , table: int_full_act_record.0 */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
 	.resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
 	.resource_sub_type =
@@ -449,16 +461,18 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 27,
+		.cond_start_idx = 22,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 167,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.result_start_idx = 90,
 	.result_bit_size = 128,
-	.result_num_fields = 26
+	.result_num_fields = 26,
+	.encap_num_fields = 0
 	},
-	{ /* act_tid: 3, , table: ext_full_act_record.0 */
+	{ /* act_tid: 1, , table: ext_full_act_record.0 */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
 	.resource_type = TF_TBL_TYPE_EXT,
 	.resource_sub_type =
@@ -468,865 +482,6768 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_act_tbl_list[] = {
 		.cond_true_goto  = 0,
 		.cond_false_goto = 0,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 28,
+		.cond_start_idx = 23,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 193,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.result_start_idx = 116,
 	.result_bit_size = 128,
 	.result_num_fields = 26,
 	.encap_num_fields = 11
 	},
-	{ /* act_tid: 4, , table: int_flow_counter_tbl.0 */
+	{ /* act_tid: 2, , table: control.0 */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_RX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 24,
+		.cond_nums = 0 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_ALLOC_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID
+	},
+	{ /* act_tid: 2, , table: mirror_tbl.alloc */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type = TF_TBL_TYPE_ACT_STATS_64,
+	.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,
 	.resource_sub_type =
-		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT,
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
 	.direction = TF_DIR_RX,
 	.execute_info = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 30,
-		.cond_nums = 1 },
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 24,
+		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.tbl_operand = BNXT_ULP_RF_IDX_MIRROR_PTR_0,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
 	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-	.result_start_idx = 230,
-	.result_bit_size = 64,
-	.result_num_fields = 1
+	.result_start_idx = 153,
+	.result_bit_size = 32,
+	.result_num_fields = 6
 	},
-	{ /* act_tid: 4, , table: vnic_interface_rss_config.0 */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_VNIC_TABLE,
+	{ /* act_tid: 2, , table: int_flow_counter_tbl.0 */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_ACT_STATS_64,
 	.resource_sub_type =
-		BNXT_ULP_RESOURCE_SUB_TYPE_VNIC_TABLE_RSS,
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT,
 	.direction = TF_DIR_RX,
 	.execute_info = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 31,
+		.cond_start_idx = 24,
 		.cond_nums = 1 },
-	.tbl_opcode = BNXT_ULP_VNIC_TBL_OPC_ALLOC_WR_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_RSS_VNIC,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 231,
-	.result_bit_size = 0,
-	.result_num_fields = 0
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.result_start_idx = 159,
+	.result_bit_size = 64,
+	.result_num_fields = 1
 	},
-	{ /* act_tid: 4, , table: vnic_interface_queue_config.0 */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_VNIC_TABLE,
+	{ /* act_tid: 2, , table: int_full_act_record.0 */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
 	.resource_sub_type =
-		BNXT_ULP_RESOURCE_SUB_TYPE_VNIC_TABLE_QUEUE,
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
 	.direction = TF_DIR_RX,
 	.execute_info = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 32,
+		.cond_start_idx = 25,
 		.cond_nums = 1 },
-	.tbl_opcode = BNXT_ULP_VNIC_TBL_OPC_ALLOC_WR_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_RSS_VNIC,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 231,
-	.result_bit_size = 0,
-	.result_num_fields = 0
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.result_start_idx = 160,
+	.result_bit_size = 128,
+	.result_num_fields = 26,
+	.encap_num_fields = 0
 	},
-	{ /* act_tid: 4, , table: int_full_act_record.0 */
+	{ /* act_tid: 2, , table: ext_full_act_record.0 */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
+	.resource_type = TF_TBL_TYPE_EXT,
 	.resource_sub_type =
 		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
 	.direction = TF_DIR_RX,
 	.execute_info = {
-		.cond_true_goto  = 0,
+		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_OR,
-		.cond_start_idx = 33,
-		.cond_nums = 2 },
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 26,
+		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
 	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-	.result_start_idx = 231,
+	.result_start_idx = 186,
 	.result_bit_size = 128,
 	.result_num_fields = 26,
-	.encap_num_fields = 0
+	.encap_num_fields = 11
 	},
-	{ /* act_tid: 4, , table: int_full_act_record.1 */
+	{ /* act_tid: 2, , table: mirror_tbl.wr */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
+	.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,
 	.resource_sub_type =
 		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
 	.direction = TF_DIR_RX,
 	.execute_info = {
-		.cond_true_goto  = 0,
-		.cond_false_goto = 0,
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 35,
+		.cond_start_idx = 27,
 		.cond_nums = 0 },
-	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_MIRROR_PTR_0,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
 	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-	.result_start_idx = 257,
-	.result_bit_size = 128,
-	.result_num_fields = 26,
-	.encap_num_fields = 0
+	.result_start_idx = 223,
+	.result_bit_size = 32,
+	.result_num_fields = 6
 	},
-	{ /* act_tid: 5, , table: control.0 */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	{ /* act_tid: 2, , table: shared_mirror_record.wr */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
+	.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_SHARED_MIRROR,
 	.direction = TF_DIR_RX,
 	.execute_info = {
-		.cond_true_goto  = 1023,
+		.cond_true_goto  = 0,
 		.cond_false_goto = 0,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 35,
+		.cond_start_idx = 27,
 		.cond_nums = 0 },
-	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP
+	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_WRITE,
+	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
+	.ref_cnt_opcode = BNXT_ULP_REF_CNT_OPC_INC,
+	.key_start_idx = 4,
+	.blob_key_bit_size = 4,
+	.key_bit_size = 4,
+	.key_num_fields = 1,
+	.result_start_idx = 229,
+	.result_bit_size = 36,
+	.result_num_fields = 2
 	},
-	{ /* act_tid: 6, , table: int_flow_counter_tbl.0 */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type = TF_TBL_TYPE_ACT_STATS_64,
-	.resource_sub_type =
-		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT,
-	.direction = TF_DIR_TX,
+	{ /* act_tid: 3, , table: control.0 */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_RX,
 	.execute_info = {
-		.cond_true_goto  = 1,
+		.cond_true_goto  = 1023,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 35,
-		.cond_nums = 1 },
-	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 283,
-	.result_bit_size = 64,
-	.result_num_fields = 1
+		.cond_start_idx = 30,
+		.cond_nums = 3 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP
 	},
-	{ /* act_tid: 6, , table: int_vtag_encap_record.0 */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type = TF_TBL_TYPE_ACT_ENCAP_16B,
-	.resource_sub_type =
-		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
-	.direction = TF_DIR_TX,
+	{ /* act_tid: 3, , table: control.set_dest_vnic_default */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_RX,
 	.execute_info = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 36,
-		.cond_nums = 2 },
-	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_ENCAP_PTR_0,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.record_size = 8,
-	.result_start_idx = 284,
-	.result_bit_size = 0,
-	.result_num_fields = 0,
-	.encap_num_fields = 11
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 33,
+		.cond_nums = 0 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
+	.func_info = {
+		.func_opc = BNXT_ULP_FUNC_OPC_COPY_SRC1_TO_RF,
+		.func_src1 = BNXT_ULP_FUNC_SRC_COMP_FIELD,
+		.func_opr1 = BNXT_ULP_CF_IDX_MP_VNIC_A,
+		.func_dst_opr = BNXT_ULP_RF_IDX_DEST_VNIC }
 	},
-	{ /* act_tid: 6, , table: int_full_act_record.0 */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
+	{ /* act_tid: 3, , table: multi_shared_mirror_record.rd_a */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
+	.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,
 	.resource_sub_type =
-		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
-	.direction = TF_DIR_TX,
+		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_MULTI_SHARED_MIRROR,
+	.direction = TF_DIR_RX,
 	.execute_info = {
 		.cond_true_goto  = 1,
-		.cond_false_goto = 1,
+		.cond_false_goto = 14,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 38,
+		.cond_start_idx = 33,
 		.cond_nums = 1 },
-	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
+	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
+	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 295,
-	.result_bit_size = 128,
-	.result_num_fields = 26
+	.key_start_idx = 5,
+	.blob_key_bit_size = 8,
+	.key_bit_size = 8,
+	.key_num_fields = 1,
+	.ident_start_idx = 3,
+	.ident_nums = 1
 	},
-	{ /* act_tid: 6, , table: ext_full_act_record.no_tag */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type = TF_TBL_TYPE_EXT,
-	.resource_sub_type =
-		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
-	.direction = TF_DIR_TX,
+	{ /* act_tid: 3, , table: control.mirror_port_a */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_RX,
 	.execute_info = {
-		.cond_true_goto  = 1,
+		.cond_true_goto  = 2,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 39,
-		.cond_nums = 2 },
-	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 321,
-	.result_bit_size = 128,
-	.result_num_fields = 26,
-	.encap_num_fields = 11
-	},
-	{ /* act_tid: 6, , table: ext_full_act_record.one_tag */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type = TF_TBL_TYPE_EXT,
-	.resource_sub_type =
-		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
-	.direction = TF_DIR_TX,
-	.execute_info = {
-		.cond_true_goto  = 0,
-		.cond_false_goto = 0,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 41,
-		.cond_nums = 2 },
-	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 358,
-	.result_bit_size = 128,
-	.result_num_fields = 26,
-	.encap_num_fields = 11
+		.cond_start_idx = 34,
+		.cond_nums = 1 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP
 	},
-	{ /* act_tid: 7, , table: control.0 */
+	{ /* act_tid: 3, , table: control.set_dest_vnic_b */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
-	.direction = TF_DIR_TX,
+	.direction = TF_DIR_RX,
 	.execute_info = {
-		.cond_true_goto  = 1023,
+		.cond_true_goto  = 12,
 		.cond_false_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 46,
-		.cond_nums = 3 },
-	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 35,
+		.cond_nums = 0 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
+	.func_info = {
+		.func_opc = BNXT_ULP_FUNC_OPC_COPY_SRC1_TO_RF,
+		.func_src1 = BNXT_ULP_FUNC_SRC_COMP_FIELD,
+		.func_opr1 = BNXT_ULP_CF_IDX_MP_VNIC_B,
+		.func_dst_opr = BNXT_ULP_RF_IDX_DEST_VNIC }
 	},
-	{ /* act_tid: 7, , table: int_flow_counter_tbl.0 */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type = TF_TBL_TYPE_ACT_STATS_64,
+	{ /* act_tid: 3, , table: multi_shared_mirror_record.rd_b */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
+	.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,
 	.resource_sub_type =
-		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT,
-	.direction = TF_DIR_TX,
+		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_MULTI_SHARED_MIRROR,
+	.direction = TF_DIR_RX,
 	.execute_info = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 49,
-		.cond_nums = 1 },
-	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 35,
+		.cond_nums = 0 },
+	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
+	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 395,
-	.result_bit_size = 64,
-	.result_num_fields = 1
+	.key_start_idx = 6,
+	.blob_key_bit_size = 8,
+	.key_bit_size = 8,
+	.key_num_fields = 1,
+	.ident_start_idx = 4,
+	.ident_nums = 1
 	},
-	{ /* act_tid: 7, , table: act_modify_ipv4_src.0 */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type = TF_TBL_TYPE_ACT_MODIFY_IPV4,
-	.resource_sub_type =
-		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
-	.direction = TF_DIR_TX,
+	{ /* act_tid: 3, , table: control.mirror_port_b */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_RX,
 	.execute_info = {
-		.cond_true_goto  = 1,
+		.cond_true_goto  = 2,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 50,
+		.cond_start_idx = 35,
 		.cond_nums = 1 },
-	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 396,
-	.result_bit_size = 32,
-	.result_num_fields = 1
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP
 	},
-	{ /* act_tid: 7, , table: act_modify_ipv4_dst.0 */
+	{ /* act_tid: 3, , table: control.set_dest_vnic_a */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_RX,
+	.execute_info = {
+		.cond_true_goto  = 9,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 36,
+		.cond_nums = 0 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
+	.func_info = {
+		.func_opc = BNXT_ULP_FUNC_OPC_COPY_SRC1_TO_RF,
+		.func_src1 = BNXT_ULP_FUNC_SRC_COMP_FIELD,
+		.func_opr1 = BNXT_ULP_CF_IDX_MP_VNIC_A,
+		.func_dst_opr = BNXT_ULP_RF_IDX_DEST_VNIC }
+	},
+	{ /* act_tid: 3, , table: control.mirror */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_RX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 36,
+		.cond_nums = 0 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_ALLOC_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID
+	},
+	{ /* act_tid: 3, , table: mirror_tbl.alloc */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type = TF_TBL_TYPE_ACT_MODIFY_IPV4,
+	.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,
 	.resource_sub_type =
 		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
-	.direction = TF_DIR_TX,
+	.direction = TF_DIR_RX,
 	.execute_info = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 51,
-		.cond_nums = 1 },
-	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 397,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 36,
+		.cond_nums = 0 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_MIRROR_PTR_0,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.result_start_idx = 231,
 	.result_bit_size = 32,
-	.result_num_fields = 1
+	.result_num_fields = 6
 	},
-	{ /* act_tid: 7, , table: int_encap_vlan_record.dummy */
+	{ /* act_tid: 3, , table: int_flow_counter_tbl.mirror */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type = TF_TBL_TYPE_ACT_ENCAP_16B,
+	.resource_type = TF_TBL_TYPE_ACT_STATS_64,
 	.resource_sub_type =
-		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
-	.direction = TF_DIR_TX,
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT,
+	.direction = TF_DIR_RX,
 	.execute_info = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 52,
-		.cond_nums = 0 },
-	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_WR_GLB_REGFILE,
-	.tbl_operand = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
-	.record_size = 16,
-	.result_start_idx = 398,
-	.result_bit_size = 0,
-	.result_num_fields = 0,
-	.encap_num_fields = 11
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 36,
+		.cond_nums = 1 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_MIRR_FLOW_CNTR_PTR_0,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.result_start_idx = 237,
+	.result_bit_size = 64,
+	.result_num_fields = 1
 	},
-	{ /* act_tid: 7, , table: int_full_act_record.0 */
+	{ /* act_tid: 3, , table: int_full_act_record.mirror */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
 	.resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
 	.resource_sub_type =
 		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
-	.direction = TF_DIR_TX,
+	.direction = TF_DIR_RX,
 	.execute_info = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 52,
+		.cond_start_idx = 37,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 409,
+	.tbl_operand = BNXT_ULP_RF_IDX_MIRR_ACTION_PTR,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.result_start_idx = 238,
 	.result_bit_size = 128,
-	.result_num_fields = 26
+	.result_num_fields = 26,
+	.encap_num_fields = 0
 	},
-	{ /* act_tid: 7, , table: ext_full_act_record.0 */
+	{ /* act_tid: 3, , table: ext_full_act_record.mirror */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
 	.resource_type = TF_TBL_TYPE_EXT,
 	.resource_sub_type =
 		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
-	.direction = TF_DIR_TX,
+	.direction = TF_DIR_RX,
 	.execute_info = {
-		.cond_true_goto  = 0,
-		.cond_false_goto = 0,
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 53,
+		.cond_start_idx = 38,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 435,
+	.tbl_operand = BNXT_ULP_RF_IDX_MIRR_ACTION_PTR,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.result_start_idx = 264,
 	.result_bit_size = 128,
 	.result_num_fields = 26,
 	.encap_num_fields = 11
 	},
-	{ /* act_tid: 8, , table: int_flow_counter_tbl.0 */
+	{ /* act_tid: 3, , table: mirror_tbl.wr */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
+	.direction = TF_DIR_RX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 39,
+		.cond_nums = 0 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_MIRROR_PTR_0,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.result_start_idx = 301,
+	.result_bit_size = 32,
+	.result_num_fields = 6
+	},
+	{ /* act_tid: 3, , table: control.inc_mirror_id */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_RX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 39,
+		.cond_nums = 0 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
+	.func_info = {
+		.func_opc = BNXT_ULP_FUNC_OPC_ADD,
+		.func_src1 = BNXT_ULP_FUNC_SRC_REGFILE,
+		.func_opr1 = BNXT_ULP_RF_IDX_MIRROR_PTR_0,
+		.func_src2 = BNXT_ULP_FUNC_SRC_CONST,
+		.func_opr2 = 1,
+		.func_dst_opr = BNXT_ULP_RF_IDX_MIRROR_ID_0 }
+	},
+	{ /* act_tid: 3, , table: multi_shared_mirror_record.wr_b */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
+	.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_MULTI_SHARED_MIRROR,
+	.direction = TF_DIR_RX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 39,
+		.cond_nums = 0 },
+	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_WRITE,
+	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.key_start_idx = 7,
+	.blob_key_bit_size = 8,
+	.key_bit_size = 8,
+	.key_num_fields = 1,
+	.result_start_idx = 307,
+	.result_bit_size = 36,
+	.result_num_fields = 2
+	},
+	{ /* act_tid: 3, , table: int_flow_counter_tbl.0 */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
 	.resource_type = TF_TBL_TYPE_ACT_STATS_64,
 	.resource_sub_type =
 		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT,
-	.direction = TF_DIR_TX,
+	.direction = TF_DIR_RX,
 	.execute_info = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 57,
+		.cond_start_idx = 39,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 472,
+	.result_start_idx = 309,
 	.result_bit_size = 64,
 	.result_num_fields = 1
 	},
-	{ /* act_tid: 8, , table: sp_smac_ipv4.0 */
+	{ /* act_tid: 3, , table: act_modify_ipv4_src.0 */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
+	.resource_type = TF_TBL_TYPE_ACT_MODIFY_IPV4,
 	.resource_sub_type =
 		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
-	.direction = TF_DIR_TX,
+	.direction = TF_DIR_RX,
 	.execute_info = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 58,
+		.cond_start_idx = 40,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_SP_PTR,
+	.tbl_operand = BNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.record_size = 16,
-	.result_start_idx = 473,
-	.result_bit_size = 0,
-	.result_num_fields = 0,
-	.encap_num_fields = 2
+	.result_start_idx = 310,
+	.result_bit_size = 32,
+	.result_num_fields = 1
 	},
-	{ /* act_tid: 8, , table: sp_smac_ipv6.0 */
+	{ /* act_tid: 3, , table: act_modify_ipv4_dst.0 */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type = TF_TBL_TYPE_ACT_SP_SMAC_IPV6,
+	.resource_type = TF_TBL_TYPE_ACT_MODIFY_IPV4,
 	.resource_sub_type =
 		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
-	.direction = TF_DIR_TX,
+	.direction = TF_DIR_RX,
 	.execute_info = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 59,
+		.cond_start_idx = 41,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_SP_PTR,
+	.tbl_operand = BNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.record_size = 24,
-	.result_start_idx = 475,
-	.result_bit_size = 0,
-	.result_num_fields = 0,
-	.encap_num_fields = 2
+	.result_start_idx = 311,
+	.result_bit_size = 32,
+	.result_num_fields = 1
 	},
-	{ /* act_tid: 8, , table: int_tun_encap_record.0 */
+	{ /* act_tid: 3, , table: int_encap_mac_record.0 */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type = TF_TBL_TYPE_ACT_ENCAP_64B,
+	.resource_type = TF_TBL_TYPE_ACT_ENCAP_16B,
 	.resource_sub_type =
 		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
-	.direction = TF_DIR_TX,
+	.direction = TF_DIR_RX,
 	.execute_info = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 60,
-		.cond_nums = 1 },
-	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_ENCAP_PTR_0,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.record_size = 64,
-	.result_start_idx = 477,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 42,
+		.cond_nums = 0 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_WR_GLB_REGFILE,
+	.tbl_operand = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
+	.record_size = 16,
+	.result_start_idx = 312,
 	.result_bit_size = 0,
 	.result_num_fields = 0,
-	.encap_num_fields = 30
+	.encap_num_fields = 11
 	},
-	{ /* act_tid: 8, , table: int_full_act_record.0 */
+	{ /* act_tid: 3, , table: int_full_act_record.0 */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
 	.resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
 	.resource_sub_type =
 		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
-	.direction = TF_DIR_TX,
+	.direction = TF_DIR_RX,
 	.execute_info = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 61,
+		.cond_start_idx = 42,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 507,
+	.result_start_idx = 323,
 	.result_bit_size = 128,
 	.result_num_fields = 26
 	},
-	{ /* act_tid: 8, , table: ext_full_act_record_vxlan.0 */
+	{ /* act_tid: 3, , table: ext_full_act_record.0 */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
 	.resource_type = TF_TBL_TYPE_EXT,
 	.resource_sub_type =
 		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
-	.direction = TF_DIR_TX,
+	.direction = TF_DIR_RX,
 	.execute_info = {
 		.cond_true_goto  = 0,
 		.cond_false_goto = 0,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 62,
+		.cond_start_idx = 43,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 533,
+	.result_start_idx = 349,
 	.result_bit_size = 128,
 	.result_num_fields = 26,
-	.encap_num_fields = 30
-	},
-	{ /* act_tid: 9, , table: control.reject */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
-	.direction = TF_DIR_TX,
-	.execute_info = {
-		.cond_true_goto  = 1023,
-		.cond_false_goto = 1023,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 63,
-		.cond_nums = 0 },
-	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP
+	.encap_num_fields = 11
 	},
-	{ /* act_tid: 9, , table: int_flow_counter_tbl.0 */
+	{ /* act_tid: 4, , table: int_flow_counter_tbl.0 */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
 	.resource_type = TF_TBL_TYPE_ACT_STATS_64,
 	.resource_sub_type =
 		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT,
-	.direction = TF_DIR_TX,
+	.direction = TF_DIR_RX,
 	.execute_info = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 63,
+		.cond_start_idx = 45,
 		.cond_nums = 1 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 589,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.result_start_idx = 386,
 	.result_bit_size = 64,
 	.result_num_fields = 1
 	},
-	{ /* act_tid: 9, , table: int_full_act_record.0 */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
+	{ /* act_tid: 4, , table: vnic_interface_rss_config.0 */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_VNIC_TABLE,
 	.resource_sub_type =
-		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
-	.direction = TF_DIR_TX,
+		BNXT_ULP_RESOURCE_SUB_TYPE_VNIC_TABLE_RSS,
+	.direction = TF_DIR_RX,
 	.execute_info = {
-		.cond_true_goto  = 0,
-		.cond_false_goto = 0,
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
-		.cond_start_idx = 64,
+		.cond_start_idx = 46,
 		.cond_nums = 1 },
-	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
+	.tbl_opcode = BNXT_ULP_VNIC_TBL_OPC_ALLOC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_RSS_VNIC,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 590,
-	.result_bit_size = 128,
-	.result_num_fields = 26
-	}
-};
-
-struct bnxt_ulp_mapper_cond_info ulp_wh_plus_act_cond_list[] = {
-	/* cond_reject: wh_plus, act_tid: 1 */
-	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_SET_IPV4_SRC
-	},
+	.result_start_idx = 387,
+	.result_bit_size = 0,
+	.result_num_fields = 0
+	},
+	{ /* act_tid: 4, , table: vnic_interface_queue_config.0 */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_VNIC_TABLE,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_VNIC_TABLE_QUEUE,
+	.direction = TF_DIR_RX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 47,
+		.cond_nums = 1 },
+	.tbl_opcode = BNXT_ULP_VNIC_TBL_OPC_ALLOC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_RSS_VNIC,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.result_start_idx = 387,
+	.result_bit_size = 0,
+	.result_num_fields = 0
+	},
+	{ /* act_tid: 4, , table: int_full_act_record.0 */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
+	.direction = TF_DIR_RX,
+	.execute_info = {
+		.cond_true_goto  = 0,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_OR,
+		.cond_start_idx = 48,
+		.cond_nums = 2 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.result_start_idx = 387,
+	.result_bit_size = 128,
+	.result_num_fields = 26,
+	.encap_num_fields = 0
+	},
+	{ /* act_tid: 4, , table: int_full_act_record.1 */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
+	.direction = TF_DIR_RX,
+	.execute_info = {
+		.cond_true_goto  = 0,
+		.cond_false_goto = 0,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 50,
+		.cond_nums = 0 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.result_start_idx = 413,
+	.result_bit_size = 128,
+	.result_num_fields = 26,
+	.encap_num_fields = 0
+	},
+	{ /* act_tid: 5, , table: control.0 */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_RX,
+	.execute_info = {
+		.cond_true_goto  = 1023,
+		.cond_false_goto = 0,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 50,
+		.cond_nums = 0 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP
+	},
+	{ /* act_tid: 6, , table: control.set_dest_vport_default */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 50,
+		.cond_nums = 0 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
+	.func_info = {
+		.func_opc = BNXT_ULP_FUNC_OPC_COPY_SRC1_TO_RF,
+		.func_src1 = BNXT_ULP_FUNC_SRC_COMP_FIELD,
+		.func_opr1 = BNXT_ULP_CF_IDX_MP_VPORT_A,
+		.func_dst_opr = BNXT_ULP_RF_IDX_DEST_VPORT }
+	},
+	{ /* act_tid: 6, , table: shared_mirror_record.rd */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
+	.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_SHARED_MIRROR,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 2,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 50,
+		.cond_nums = 1 },
+	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
+	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.key_start_idx = 8,
+	.blob_key_bit_size = 4,
+	.key_bit_size = 4,
+	.key_num_fields = 1,
+	.ident_start_idx = 5,
+	.ident_nums = 1
+	},
+	{ /* act_tid: 6, , table: control.mirror.0 */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1023,
+		.cond_false_goto = 16,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 51,
+		.cond_nums = 1 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP
+	},
+	{ /* act_tid: 6, , table: multi_shared_mirror_record.rd_a */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
+	.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_MULTI_SHARED_MIRROR,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 15,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 52,
+		.cond_nums = 1 },
+	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
+	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.key_start_idx = 9,
+	.blob_key_bit_size = 8,
+	.key_bit_size = 8,
+	.key_num_fields = 1,
+	.ident_start_idx = 6,
+	.ident_nums = 1
+	},
+	{ /* act_tid: 6, , table: control.mirror_port_a */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 2,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 53,
+		.cond_nums = 1 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP
+	},
+	{ /* act_tid: 6, , table: control.set_dest_vport_b */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 13,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 54,
+		.cond_nums = 0 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
+	.func_info = {
+		.func_opc = BNXT_ULP_FUNC_OPC_COPY_SRC1_TO_RF,
+		.func_src1 = BNXT_ULP_FUNC_SRC_COMP_FIELD,
+		.func_opr1 = BNXT_ULP_CF_IDX_MP_VPORT_B,
+		.func_dst_opr = BNXT_ULP_RF_IDX_DEST_VPORT }
+	},
+	{ /* act_tid: 6, , table: multi_shared_mirror_record.rd_b */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
+	.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_MULTI_SHARED_MIRROR,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 54,
+		.cond_nums = 0 },
+	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
+	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.key_start_idx = 10,
+	.blob_key_bit_size = 8,
+	.key_bit_size = 8,
+	.key_num_fields = 1,
+	.ident_start_idx = 7,
+	.ident_nums = 1
+	},
+	{ /* act_tid: 6, , table: control.mirror_port_b */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 2,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 54,
+		.cond_nums = 1 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP
+	},
+	{ /* act_tid: 6, , table: control.set_dest_vport_a */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 10,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 55,
+		.cond_nums = 0 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
+	.func_info = {
+		.func_opc = BNXT_ULP_FUNC_OPC_COPY_SRC1_TO_RF,
+		.func_src1 = BNXT_ULP_FUNC_SRC_COMP_FIELD,
+		.func_opr1 = BNXT_ULP_CF_IDX_MP_VPORT_A,
+		.func_dst_opr = BNXT_ULP_RF_IDX_DEST_VPORT }
+	},
+	{ /* act_tid: 6, , table: control.mirror */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 55,
+		.cond_nums = 0 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_ALLOC_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID
+	},
+	{ /* act_tid: 6, , table: control.set_dest_is_b_vfrep */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1023,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 55,
+		.cond_nums = 1 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP
+	},
+	{ /* act_tid: 6, , table: mirror_tbl.alloc */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 56,
+		.cond_nums = 0 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_MIRROR_PTR_0,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.result_start_idx = 439,
+	.result_bit_size = 32,
+	.result_num_fields = 6
+	},
+	{ /* act_tid: 6, , table: int_flow_counter_tbl.mirror */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_ACT_STATS_64,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 56,
+		.cond_nums = 1 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_MIRR_FLOW_CNTR_PTR_0,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.result_start_idx = 445,
+	.result_bit_size = 64,
+	.result_num_fields = 1
+	},
+	{ /* act_tid: 6, , table: int_encap_custom_record.mirr_2_vf */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_ACT_ENCAP_64B,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 57,
+		.cond_nums = 0 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_MIRR_ENCAP_PTR_0,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.record_size = 64,
+	.result_start_idx = 446,
+	.result_bit_size = 0,
+	.result_num_fields = 0,
+	.encap_num_fields = 11
+	},
+	{ /* act_tid: 6, , table: int_full_act_record.mirr_2_vf */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 57,
+		.cond_nums = 1 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_MIRR_ACTION_PTR,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.result_start_idx = 457,
+	.result_bit_size = 128,
+	.result_num_fields = 26
+	},
+	{ /* act_tid: 6, , table: mirror_tbl.wr */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 58,
+		.cond_nums = 0 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_MIRROR_PTR_0,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.result_start_idx = 483,
+	.result_bit_size = 32,
+	.result_num_fields = 6
+	},
+	{ /* act_tid: 6, , table: control.inc_mirror_id */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 58,
+		.cond_nums = 0 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
+	.func_info = {
+		.func_opc = BNXT_ULP_FUNC_OPC_ADD,
+		.func_src1 = BNXT_ULP_FUNC_SRC_REGFILE,
+		.func_opr1 = BNXT_ULP_RF_IDX_MIRROR_PTR_0,
+		.func_src2 = BNXT_ULP_FUNC_SRC_CONST,
+		.func_opr2 = 1,
+		.func_dst_opr = BNXT_ULP_RF_IDX_MIRROR_ID_0 }
+	},
+	{ /* act_tid: 6, , table: multi_shared_mirror_record.wr_b */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
+	.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_MULTI_SHARED_MIRROR,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 58,
+		.cond_nums = 0 },
+	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_WRITE,
+	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.key_start_idx = 11,
+	.blob_key_bit_size = 8,
+	.key_bit_size = 8,
+	.key_num_fields = 1,
+	.result_start_idx = 489,
+	.result_bit_size = 36,
+	.result_num_fields = 2
+	},
+	{ /* act_tid: 6, , table: int_flow_counter_tbl.0 */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_ACT_STATS_64,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 58,
+		.cond_nums = 1 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.result_start_idx = 491,
+	.result_bit_size = 64,
+	.result_num_fields = 1
+	},
+	{ /* act_tid: 6, , table: int_vtag_encap_record.0 */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_ACT_ENCAP_16B,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 59,
+		.cond_nums = 2 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_ENCAP_PTR_0,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.record_size = 8,
+	.result_start_idx = 492,
+	.result_bit_size = 0,
+	.result_num_fields = 0,
+	.encap_num_fields = 11
+	},
+	{ /* act_tid: 6, , table: int_full_act_record.0 */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 61,
+		.cond_nums = 1 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.result_start_idx = 503,
+	.result_bit_size = 128,
+	.result_num_fields = 26
+	},
+	{ /* act_tid: 6, , table: ext_full_act_record.no_tag */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_EXT,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 62,
+		.cond_nums = 2 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.result_start_idx = 529,
+	.result_bit_size = 128,
+	.result_num_fields = 26,
+	.encap_num_fields = 11
+	},
+	{ /* act_tid: 6, , table: ext_full_act_record.one_tag */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_EXT,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 0,
+		.cond_false_goto = 0,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 64,
+		.cond_nums = 2 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.result_start_idx = 566,
+	.result_bit_size = 128,
+	.result_num_fields = 26,
+	.encap_num_fields = 11
+	},
+	{ /* act_tid: 7, , table: control.0 */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1023,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 68,
+		.cond_nums = 3 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP
+	},
+	{ /* act_tid: 7, , table: control.set_dest_vport_default */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 71,
+		.cond_nums = 0 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
+	.func_info = {
+		.func_opc = BNXT_ULP_FUNC_OPC_COPY_SRC1_TO_RF,
+		.func_src1 = BNXT_ULP_FUNC_SRC_COMP_FIELD,
+		.func_opr1 = BNXT_ULP_CF_IDX_MP_VPORT_A,
+		.func_dst_opr = BNXT_ULP_RF_IDX_DEST_VPORT }
+	},
+	{ /* act_tid: 7, , table: shared_mirror_record.rd */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
+	.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_SHARED_MIRROR,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 2,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 71,
+		.cond_nums = 1 },
+	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
+	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.key_start_idx = 12,
+	.blob_key_bit_size = 4,
+	.key_bit_size = 4,
+	.key_num_fields = 1,
+	.ident_start_idx = 8,
+	.ident_nums = 1
+	},
+	{ /* act_tid: 7, , table: control.mirror.0 */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1023,
+		.cond_false_goto = 16,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 72,
+		.cond_nums = 1 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP
+	},
+	{ /* act_tid: 7, , table: multi_shared_mirror_record.rd_a */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
+	.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_MULTI_SHARED_MIRROR,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 15,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 73,
+		.cond_nums = 1 },
+	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
+	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.key_start_idx = 13,
+	.blob_key_bit_size = 8,
+	.key_bit_size = 8,
+	.key_num_fields = 1,
+	.ident_start_idx = 9,
+	.ident_nums = 1
+	},
+	{ /* act_tid: 7, , table: control.mirror_port_a */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 2,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 74,
+		.cond_nums = 1 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP
+	},
+	{ /* act_tid: 7, , table: control.set_dest_vport_b */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 13,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 75,
+		.cond_nums = 0 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
+	.func_info = {
+		.func_opc = BNXT_ULP_FUNC_OPC_COPY_SRC1_TO_RF,
+		.func_src1 = BNXT_ULP_FUNC_SRC_COMP_FIELD,
+		.func_opr1 = BNXT_ULP_CF_IDX_MP_VPORT_B,
+		.func_dst_opr = BNXT_ULP_RF_IDX_DEST_VPORT }
+	},
+	{ /* act_tid: 7, , table: multi_shared_mirror_record.rd_b */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
+	.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_MULTI_SHARED_MIRROR,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 75,
+		.cond_nums = 0 },
+	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
+	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.key_start_idx = 14,
+	.blob_key_bit_size = 8,
+	.key_bit_size = 8,
+	.key_num_fields = 1,
+	.ident_start_idx = 10,
+	.ident_nums = 1
+	},
+	{ /* act_tid: 7, , table: control.mirror_port_b */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 2,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 75,
+		.cond_nums = 1 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP
+	},
+	{ /* act_tid: 7, , table: control.set_dest_vport_a */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 10,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 76,
+		.cond_nums = 0 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
+	.func_info = {
+		.func_opc = BNXT_ULP_FUNC_OPC_COPY_SRC1_TO_RF,
+		.func_src1 = BNXT_ULP_FUNC_SRC_COMP_FIELD,
+		.func_opr1 = BNXT_ULP_CF_IDX_MP_VPORT_A,
+		.func_dst_opr = BNXT_ULP_RF_IDX_DEST_VPORT }
+	},
+	{ /* act_tid: 7, , table: control.mirror */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 76,
+		.cond_nums = 0 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_ALLOC_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID
+	},
+	{ /* act_tid: 7, , table: control.set_dest_is_b_vfrep */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1023,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 76,
+		.cond_nums = 1 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP
+	},
+	{ /* act_tid: 7, , table: mirror_tbl.alloc */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 77,
+		.cond_nums = 0 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_MIRROR_PTR_0,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.result_start_idx = 603,
+	.result_bit_size = 32,
+	.result_num_fields = 6
+	},
+	{ /* act_tid: 7, , table: int_flow_counter_tbl.mirror */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_ACT_STATS_64,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 77,
+		.cond_nums = 1 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_MIRR_FLOW_CNTR_PTR_0,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.result_start_idx = 609,
+	.result_bit_size = 64,
+	.result_num_fields = 1
+	},
+	{ /* act_tid: 7, , table: int_encap_custom_record.mirr_2_vf */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_ACT_ENCAP_64B,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 78,
+		.cond_nums = 0 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_MIRR_ENCAP_PTR_0,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.record_size = 64,
+	.result_start_idx = 610,
+	.result_bit_size = 0,
+	.result_num_fields = 0,
+	.encap_num_fields = 11
+	},
+	{ /* act_tid: 7, , table: int_full_act_record.mirr_2_vf */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 78,
+		.cond_nums = 1 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_MIRR_ACTION_PTR,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.result_start_idx = 621,
+	.result_bit_size = 128,
+	.result_num_fields = 26
+	},
+	{ /* act_tid: 7, , table: mirror_tbl.wr */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 79,
+		.cond_nums = 0 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_MIRROR_PTR_0,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.result_start_idx = 647,
+	.result_bit_size = 32,
+	.result_num_fields = 6
+	},
+	{ /* act_tid: 7, , table: control.inc_mirror_id */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 79,
+		.cond_nums = 0 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
+	.func_info = {
+		.func_opc = BNXT_ULP_FUNC_OPC_ADD,
+		.func_src1 = BNXT_ULP_FUNC_SRC_REGFILE,
+		.func_opr1 = BNXT_ULP_RF_IDX_MIRROR_PTR_0,
+		.func_src2 = BNXT_ULP_FUNC_SRC_CONST,
+		.func_opr2 = 1,
+		.func_dst_opr = BNXT_ULP_RF_IDX_MIRROR_ID_0 }
+	},
+	{ /* act_tid: 7, , table: multi_shared_mirror_record.wr_b */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
+	.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_MULTI_SHARED_MIRROR,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 79,
+		.cond_nums = 0 },
+	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_WRITE,
+	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.key_start_idx = 15,
+	.blob_key_bit_size = 8,
+	.key_bit_size = 8,
+	.key_num_fields = 1,
+	.result_start_idx = 653,
+	.result_bit_size = 36,
+	.result_num_fields = 2
+	},
+	{ /* act_tid: 7, , table: int_flow_counter_tbl.0 */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_ACT_STATS_64,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 79,
+		.cond_nums = 1 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.result_start_idx = 655,
+	.result_bit_size = 64,
+	.result_num_fields = 1
+	},
+	{ /* act_tid: 7, , table: act_modify_ipv4_src.0 */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_ACT_MODIFY_IPV4,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 80,
+		.cond_nums = 1 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.result_start_idx = 656,
+	.result_bit_size = 32,
+	.result_num_fields = 1
+	},
+	{ /* act_tid: 7, , table: act_modify_ipv4_dst.0 */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_ACT_MODIFY_IPV4,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 81,
+		.cond_nums = 1 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.result_start_idx = 657,
+	.result_bit_size = 32,
+	.result_num_fields = 1
+	},
+	{ /* act_tid: 7, , table: int_encap_mac_record.dummy */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_ACT_ENCAP_16B,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 82,
+		.cond_nums = 0 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_WR_GLB_REGFILE,
+	.tbl_operand = BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
+	.record_size = 16,
+	.result_start_idx = 658,
+	.result_bit_size = 0,
+	.result_num_fields = 0,
+	.encap_num_fields = 11
+	},
+	{ /* act_tid: 7, , table: int_full_act_record.0 */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 82,
+		.cond_nums = 1 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.result_start_idx = 669,
+	.result_bit_size = 128,
+	.result_num_fields = 26
+	},
+	{ /* act_tid: 7, , table: ext_full_act_record.0 */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_EXT,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 0,
+		.cond_false_goto = 0,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 83,
+		.cond_nums = 1 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.result_start_idx = 695,
+	.result_bit_size = 128,
+	.result_num_fields = 26,
+	.encap_num_fields = 11
+	},
+	{ /* act_tid: 8, , table: control.set_dest_vnic_default */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 86,
+		.cond_nums = 0 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
+	.func_info = {
+		.func_opc = BNXT_ULP_FUNC_OPC_COPY_SRC1_TO_RF,
+		.func_src1 = BNXT_ULP_FUNC_SRC_COMP_FIELD,
+		.func_opr1 = BNXT_ULP_CF_IDX_MP_VPORT_A,
+		.func_dst_opr = BNXT_ULP_RF_IDX_DEST_VPORT }
+	},
+	{ /* act_tid: 8, , table: shared_mirror_record.rd */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
+	.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_SHARED_MIRROR,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 2,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 86,
+		.cond_nums = 1 },
+	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
+	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.key_start_idx = 16,
+	.blob_key_bit_size = 4,
+	.key_bit_size = 4,
+	.key_num_fields = 1,
+	.ident_start_idx = 11,
+	.ident_nums = 1
+	},
+	{ /* act_tid: 8, , table: control.mirror.0 */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1023,
+		.cond_false_goto = 16,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 87,
+		.cond_nums = 1 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP
+	},
+	{ /* act_tid: 8, , table: multi_shared_mirror_record.rd_a */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
+	.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_MULTI_SHARED_MIRROR,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 15,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 88,
+		.cond_nums = 1 },
+	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
+	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.key_start_idx = 17,
+	.blob_key_bit_size = 8,
+	.key_bit_size = 8,
+	.key_num_fields = 1,
+	.ident_start_idx = 12,
+	.ident_nums = 1
+	},
+	{ /* act_tid: 8, , table: control.mirror_port_a */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 2,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 89,
+		.cond_nums = 1 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP
+	},
+	{ /* act_tid: 8, , table: control.set_dest_vport_b */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 13,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 90,
+		.cond_nums = 0 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
+	.func_info = {
+		.func_opc = BNXT_ULP_FUNC_OPC_COPY_SRC1_TO_RF,
+		.func_src1 = BNXT_ULP_FUNC_SRC_COMP_FIELD,
+		.func_opr1 = BNXT_ULP_CF_IDX_MP_VPORT_B,
+		.func_dst_opr = BNXT_ULP_RF_IDX_DEST_VPORT }
+	},
+	{ /* act_tid: 8, , table: multi_shared_mirror_record.rd_b */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
+	.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_MULTI_SHARED_MIRROR,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 90,
+		.cond_nums = 0 },
+	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
+	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.key_start_idx = 18,
+	.blob_key_bit_size = 8,
+	.key_bit_size = 8,
+	.key_num_fields = 1,
+	.ident_start_idx = 13,
+	.ident_nums = 1
+	},
+	{ /* act_tid: 8, , table: control.mirror_port_b */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 2,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 90,
+		.cond_nums = 1 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP
+	},
+	{ /* act_tid: 8, , table: control.set_dest_vport_a */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 10,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 91,
+		.cond_nums = 0 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
+	.func_info = {
+		.func_opc = BNXT_ULP_FUNC_OPC_COPY_SRC1_TO_RF,
+		.func_src1 = BNXT_ULP_FUNC_SRC_COMP_FIELD,
+		.func_opr1 = BNXT_ULP_CF_IDX_MP_VPORT_A,
+		.func_dst_opr = BNXT_ULP_RF_IDX_DEST_VPORT }
+	},
+	{ /* act_tid: 8, , table: control.mirror */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 91,
+		.cond_nums = 0 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_ALLOC_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID
+	},
+	{ /* act_tid: 8, , table: control.set_dest_is_b_vfrep */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1023,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 91,
+		.cond_nums = 1 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP
+	},
+	{ /* act_tid: 8, , table: mirror_tbl.alloc */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 92,
+		.cond_nums = 0 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_MIRROR_PTR_0,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.result_start_idx = 732,
+	.result_bit_size = 32,
+	.result_num_fields = 6
+	},
+	{ /* act_tid: 8, , table: int_flow_counter_tbl.mirror */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_ACT_STATS_64,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 92,
+		.cond_nums = 1 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_MIRR_FLOW_CNTR_PTR_0,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.result_start_idx = 738,
+	.result_bit_size = 64,
+	.result_num_fields = 1
+	},
+	{ /* act_tid: 8, , table: int_encap_custom_record.mirr_2_vf */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_ACT_ENCAP_64B,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 93,
+		.cond_nums = 0 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_MIRR_ENCAP_PTR_0,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.record_size = 64,
+	.result_start_idx = 739,
+	.result_bit_size = 0,
+	.result_num_fields = 0,
+	.encap_num_fields = 11
+	},
+	{ /* act_tid: 8, , table: int_full_act_record.mirr_2_vf */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 93,
+		.cond_nums = 1 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_MIRR_ACTION_PTR,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.result_start_idx = 750,
+	.result_bit_size = 128,
+	.result_num_fields = 26
+	},
+	{ /* act_tid: 8, , table: mirror_tbl.wr */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 94,
+		.cond_nums = 0 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_MIRROR_PTR_0,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.result_start_idx = 776,
+	.result_bit_size = 32,
+	.result_num_fields = 6
+	},
+	{ /* act_tid: 8, , table: control.inc_mirror_id */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 94,
+		.cond_nums = 0 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
+	.func_info = {
+		.func_opc = BNXT_ULP_FUNC_OPC_ADD,
+		.func_src1 = BNXT_ULP_FUNC_SRC_REGFILE,
+		.func_opr1 = BNXT_ULP_RF_IDX_MIRROR_PTR_0,
+		.func_src2 = BNXT_ULP_FUNC_SRC_CONST,
+		.func_opr2 = 1,
+		.func_dst_opr = BNXT_ULP_RF_IDX_MIRROR_ID_0 }
+	},
+	{ /* act_tid: 8, , table: multi_shared_mirror_record.wr_b */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
+	.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_MULTI_SHARED_MIRROR,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 94,
+		.cond_nums = 0 },
+	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_WRITE,
+	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.key_start_idx = 19,
+	.blob_key_bit_size = 8,
+	.key_bit_size = 8,
+	.key_num_fields = 1,
+	.result_start_idx = 782,
+	.result_bit_size = 36,
+	.result_num_fields = 2
+	},
+	{ /* act_tid: 8, , table: int_flow_counter_tbl.0 */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_ACT_STATS_64,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 94,
+		.cond_nums = 1 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.result_start_idx = 784,
+	.result_bit_size = 64,
+	.result_num_fields = 1
+	},
+	{ /* act_tid: 8, , table: port_table.sp_rec_rd */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PORT_TABLE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 95,
+		.cond_nums = 0 },
+	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
+	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.key_start_idx = 20,
+	.blob_key_bit_size = 8,
+	.key_bit_size = 8,
+	.key_num_fields = 1,
+	.ident_start_idx = 14,
+	.ident_nums = 1
+	},
+	{ /* act_tid: 8, , table: sp_smac_ipv4.0 */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 95,
+		.cond_nums = 2 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_SP_PTR,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
+	.record_size = 16,
+	.result_start_idx = 785,
+	.result_bit_size = 0,
+	.result_num_fields = 0,
+	.encap_num_fields = 2
+	},
+	{ /* act_tid: 8, , table: sp_smac_ipv6.0 */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_ACT_SP_SMAC_IPV6,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 97,
+		.cond_nums = 2 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_SP_PTR,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
+	.record_size = 24,
+	.result_start_idx = 787,
+	.result_bit_size = 0,
+	.result_num_fields = 0,
+	.encap_num_fields = 2
+	},
+	{ /* act_tid: 8, , table: vxlan_encap_rec_cache.rd */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_VXLAN_ENCAP_REC_CACHE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 99,
+		.cond_nums = 2 },
+	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
+	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_HASH,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.key_start_idx = 21,
+	.blob_key_bit_size = 136,
+	.key_bit_size = 136,
+	.key_num_fields = 5,
+	.ident_start_idx = 15,
+	.ident_nums = 1
+	},
+	{ /* act_tid: 8, , table: vxlan_encap_ipv6_rec_cache.rd */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_VXLAN_ENCAP_IPV6_REC_CACHE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 101,
+		.cond_nums = 2 },
+	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
+	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_HASH,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.key_start_idx = 26,
+	.blob_key_bit_size = 232,
+	.key_bit_size = 232,
+	.key_num_fields = 5,
+	.ident_start_idx = 16,
+	.ident_nums = 1
+	},
+	{ /* act_tid: 8, , table: control.vxlan */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 4,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 103,
+		.cond_nums = 1 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_ALLOC_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID
+	},
+	{ /* act_tid: 8, , table: int_tun_encap_record.0 */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_ACT_ENCAP_64B,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 104,
+		.cond_nums = 1 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_ENCAP_PTR_0,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.record_size = 64,
+	.result_start_idx = 789,
+	.result_bit_size = 0,
+	.result_num_fields = 0,
+	.encap_num_fields = 30
+	},
+	{ /* act_tid: 8, , table: vxlan_encap_rec_cache.wr */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_VXLAN_ENCAP_REC_CACHE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 105,
+		.cond_nums = 2 },
+	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_WRITE,
+	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_HASH,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.key_start_idx = 31,
+	.blob_key_bit_size = 136,
+	.key_bit_size = 136,
+	.key_num_fields = 5,
+	.result_start_idx = 819,
+	.result_bit_size = 48,
+	.result_num_fields = 2
+	},
+	{ /* act_tid: 8, , table: vxlan_encap_ipv6_rec_cache.wr */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_VXLAN_ENCAP_IPV6_REC_CACHE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 107,
+		.cond_nums = 2 },
+	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_WRITE,
+	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_HASH,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.key_start_idx = 36,
+	.blob_key_bit_size = 232,
+	.key_bit_size = 232,
+	.key_num_fields = 5,
+	.result_start_idx = 821,
+	.result_bit_size = 48,
+	.result_num_fields = 2
+	},
+	{ /* act_tid: 8, , table: int_full_act_record.0 */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 109,
+		.cond_nums = 1 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.result_start_idx = 823,
+	.result_bit_size = 128,
+	.result_num_fields = 26
+	},
+	{ /* act_tid: 8, , table: ext_full_act_record_vxlan.0 */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_EXT,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 0,
+		.cond_false_goto = 0,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 110,
+		.cond_nums = 1 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.result_start_idx = 849,
+	.result_bit_size = 128,
+	.result_num_fields = 26,
+	.encap_num_fields = 30
+	},
+	{ /* act_tid: 9, , table: control.set_dest_mdata_default */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 111,
+		.cond_nums = 0 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
+	.func_info = {
+		.func_opc = BNXT_ULP_FUNC_OPC_COPY_SRC1_TO_RF,
+		.func_src1 = BNXT_ULP_FUNC_SRC_COMP_FIELD,
+		.func_opr1 = BNXT_ULP_CF_IDX_MP_MDATA_A,
+		.func_dst_opr = BNXT_ULP_RF_IDX_DEST_METADATA }
+	},
+	{ /* act_tid: 9, , table: shared_mirror_record.rd */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
+	.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_SHARED_MIRROR,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 2,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 111,
+		.cond_nums = 1 },
+	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
+	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.key_start_idx = 41,
+	.blob_key_bit_size = 4,
+	.key_bit_size = 4,
+	.key_num_fields = 1,
+	.ident_start_idx = 17,
+	.ident_nums = 1
+	},
+	{ /* act_tid: 9, , table: control.mirror.0 */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1023,
+		.cond_false_goto = 15,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 112,
+		.cond_nums = 2 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP
+	},
+	{ /* act_tid: 9, , table: multi_shared_mirror_record.rd_a */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
+	.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_MULTI_SHARED_MIRROR,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 14,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 114,
+		.cond_nums = 1 },
+	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
+	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.key_start_idx = 42,
+	.blob_key_bit_size = 8,
+	.key_bit_size = 8,
+	.key_num_fields = 1,
+	.ident_start_idx = 18,
+	.ident_nums = 1
+	},
+	{ /* act_tid: 9, , table: control.mirror_port_a */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 2,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 115,
+		.cond_nums = 1 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP
+	},
+	{ /* act_tid: 9, , table: control.set_dest_mdata_b */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 12,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 116,
+		.cond_nums = 0 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
+	.func_info = {
+		.func_opc = BNXT_ULP_FUNC_OPC_COPY_SRC1_TO_RF,
+		.func_src1 = BNXT_ULP_FUNC_SRC_COMP_FIELD,
+		.func_opr1 = BNXT_ULP_CF_IDX_MP_MDATA_B,
+		.func_dst_opr = BNXT_ULP_RF_IDX_DEST_METADATA }
+	},
+	{ /* act_tid: 9, , table: multi_shared_mirror_record.rd_b */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
+	.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_MULTI_SHARED_MIRROR,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 116,
+		.cond_nums = 0 },
+	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
+	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.key_start_idx = 43,
+	.blob_key_bit_size = 8,
+	.key_bit_size = 8,
+	.key_num_fields = 1,
+	.ident_start_idx = 19,
+	.ident_nums = 1
+	},
+	{ /* act_tid: 9, , table: control.mirror_port_b */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 2,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 116,
+		.cond_nums = 1 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP
+	},
+	{ /* act_tid: 9, , table: control.set_dest_mdata_a */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 9,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 117,
+		.cond_nums = 0 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
+	.func_info = {
+		.func_opc = BNXT_ULP_FUNC_OPC_COPY_SRC1_TO_RF,
+		.func_src1 = BNXT_ULP_FUNC_SRC_COMP_FIELD,
+		.func_opr1 = BNXT_ULP_CF_IDX_MP_MDATA_A,
+		.func_dst_opr = BNXT_ULP_RF_IDX_DEST_METADATA }
+	},
+	{ /* act_tid: 9, , table: control.mirror */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 117,
+		.cond_nums = 0 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_ALLOC_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID
+	},
+	{ /* act_tid: 9, , table: mirror_tbl.alloc */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 117,
+		.cond_nums = 0 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_MIRROR_PTR_0,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.result_start_idx = 905,
+	.result_bit_size = 32,
+	.result_num_fields = 6
+	},
+	{ /* act_tid: 9, , table: int_flow_counter_tbl.mirror */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_ACT_STATS_64,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 117,
+		.cond_nums = 1 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_MIRR_FLOW_CNTR_PTR_0,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.result_start_idx = 911,
+	.result_bit_size = 64,
+	.result_num_fields = 1
+	},
+	{ /* act_tid: 9, , table: int_encap_custom_record.mirr_2_vf */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_ACT_ENCAP_64B,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 118,
+		.cond_nums = 0 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_MIRR_ENCAP_PTR_0,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.record_size = 64,
+	.result_start_idx = 912,
+	.result_bit_size = 0,
+	.result_num_fields = 0,
+	.encap_num_fields = 11
+	},
+	{ /* act_tid: 9, , table: int_full_act_record.mirr_2_vf */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 118,
+		.cond_nums = 1 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_MIRR_ACTION_PTR,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.result_start_idx = 923,
+	.result_bit_size = 128,
+	.result_num_fields = 26
+	},
+	{ /* act_tid: 9, , table: mirror_tbl.wr */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 119,
+		.cond_nums = 0 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_MIRROR_PTR_0,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.result_start_idx = 949,
+	.result_bit_size = 32,
+	.result_num_fields = 6
+	},
+	{ /* act_tid: 9, , table: control.inc_mirror_id */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 119,
+		.cond_nums = 0 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
+	.func_info = {
+		.func_opc = BNXT_ULP_FUNC_OPC_ADD,
+		.func_src1 = BNXT_ULP_FUNC_SRC_REGFILE,
+		.func_opr1 = BNXT_ULP_RF_IDX_MIRROR_PTR_0,
+		.func_src2 = BNXT_ULP_FUNC_SRC_CONST,
+		.func_opr2 = 1,
+		.func_dst_opr = BNXT_ULP_RF_IDX_MIRROR_ID_0 }
+	},
+	{ /* act_tid: 9, , table: multi_shared_mirror_record.wr_b */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
+	.resource_type = TF_TBL_TYPE_MIRROR_CONFIG,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_MULTI_SHARED_MIRROR,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 119,
+		.cond_nums = 0 },
+	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_WRITE,
+	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.key_start_idx = 44,
+	.blob_key_bit_size = 8,
+	.key_bit_size = 8,
+	.key_num_fields = 1,
+	.result_start_idx = 955,
+	.result_bit_size = 36,
+	.result_num_fields = 2
+	},
+	{ /* act_tid: 9, , table: int_flow_counter_tbl.0 */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_ACT_STATS_64,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_INT_COUNT,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 119,
+		.cond_nums = 1 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.result_start_idx = 957,
+	.result_bit_size = 64,
+	.result_num_fields = 1
+	},
+	{ /* act_tid: 9, , table: int_encap_custom_record.vf_2_vf */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_ACT_ENCAP_64B,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 120,
+		.cond_nums = 0 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_ENCAP_PTR_0,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.record_size = 64,
+	.result_start_idx = 958,
+	.result_bit_size = 0,
+	.result_num_fields = 0,
+	.encap_num_fields = 11
+	},
+	{ /* act_tid: 9, , table: int_full_act_record.0 */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 0,
+		.cond_false_goto = 0,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 120,
+		.cond_nums = 1 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.result_start_idx = 969,
+	.result_bit_size = 128,
+	.result_num_fields = 26
+	}
+};
+
+struct bnxt_ulp_mapper_cond_info ulp_wh_plus_act_cond_list[] = {
+	/* cond_reject: wh_plus, act_tid: 1 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_SET_IPV4_SRC
+	},
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_SET_IPV6_SRC
+	},
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_SET_TP_SRC
+	},
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_SET_IPV4_DST
+	},
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_SET_IPV6_DST
+	},
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_SET_TP_DST
+	},
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_PUSH_VLAN
+	},
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_SET_VLAN_VID
+	},
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_SET_VLAN_PCP
+	},
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_SET_MAC_DST
+	},
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_SET_MAC_SRC
+	},
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_METER
+	},
+	/* cond_execute: act_tid: 1, shared_mirror_record.rd */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_SHARED_SAMPLE
+	},
+	/* cond_execute: act_tid: 1, control.mirror_ing_0 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_RF_IS_SET,
+	.cond_operand = BNXT_ULP_RF_IDX_GENERIC_TBL_MISS
+	},
+	/* cond_execute: act_tid: 1, multi_shared_mirror_record.rd_a */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_MULTIPLE_PORT
+	},
+	/* cond_execute: act_tid: 1, control.mirror_port_a */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_RF_IS_SET,
+	.cond_operand = BNXT_ULP_RF_IDX_GENERIC_TBL_MISS
+	},
+	/* cond_execute: act_tid: 1, control.mirror_port_b */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_RF_IS_SET,
+	.cond_operand = BNXT_ULP_RF_IDX_GENERIC_TBL_MISS
+	},
+	/* cond_execute: act_tid: 1, int_flow_counter_tbl.mirror */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_COUNT
+	},
+	/* cond_execute: act_tid: 1, int_full_act_record.mirror */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_EXT_MEM_NOT_SET,
+	},
+	/* cond_execute: act_tid: 1, ext_full_act_record.mirror */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_EXT_MEM_IS_SET,
+	},
+	/* cond_execute: act_tid: 1, int_flow_counter_tbl.0 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_COUNT
+	},
+	/* cond_execute: act_tid: 1, int_vtag_encap_record.0 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_PUSH_VLAN
+	},
+	/* cond_execute: act_tid: 1, int_full_act_record.0 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_EXT_MEM_NOT_SET,
+	},
+	/* cond_execute: act_tid: 1, ext_full_act_record.0 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_EXT_MEM_IS_SET,
+	},
+	/* cond_execute: act_tid: 2, int_flow_counter_tbl.0 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_COUNT
+	},
+	/* cond_execute: act_tid: 2, int_full_act_record.0 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_EXT_MEM_NOT_SET,
+	},
+	/* cond_execute: act_tid: 2, ext_full_act_record.0 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_EXT_MEM_IS_SET,
+	},
+	/* cond_reject: wh_plus, act_tid: 3 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_SET_MAC_DST
+	},
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_SET_MAC_SRC
+	},
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_SHARED_SAMPLE
+	},
+	/* cond_execute: act_tid: 3, control.0 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_SET_IPV4_DST
+	},
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_SET_TP_DST
+	},
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_NOT_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_SET_TP_SRC
+	},
+	/* cond_execute: act_tid: 3, multi_shared_mirror_record.rd_a */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_MULTIPLE_PORT
+	},
+	/* cond_execute: act_tid: 3, control.mirror_port_a */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_RF_IS_SET,
+	.cond_operand = BNXT_ULP_RF_IDX_GENERIC_TBL_MISS
+	},
+	/* cond_execute: act_tid: 3, control.mirror_port_b */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_RF_IS_SET,
+	.cond_operand = BNXT_ULP_RF_IDX_GENERIC_TBL_MISS
+	},
+	/* cond_execute: act_tid: 3, int_flow_counter_tbl.mirror */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_COUNT
+	},
+	/* cond_execute: act_tid: 3, int_full_act_record.mirror */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_EXT_MEM_NOT_SET,
+	},
+	/* cond_execute: act_tid: 3, ext_full_act_record.mirror */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_EXT_MEM_IS_SET,
+	},
+	/* cond_execute: act_tid: 3, int_flow_counter_tbl.0 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_COUNT
+	},
+	/* cond_execute: act_tid: 3, act_modify_ipv4_src.0 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_SET_IPV4_SRC
+	},
+	/* cond_execute: act_tid: 3, act_modify_ipv4_dst.0 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_SET_IPV4_DST
+	},
+	/* cond_execute: act_tid: 3, int_full_act_record.0 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_EXT_MEM_NOT_SET,
+	},
+	/* cond_execute: act_tid: 3, ext_full_act_record.0 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_EXT_MEM_IS_SET,
+	},
+	/* cond_reject: wh_plus, act_tid: 4 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_SHARED_SAMPLE
+	},
+	/* cond_execute: act_tid: 4, int_flow_counter_tbl.0 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_COUNT
+	},
+	/* cond_execute: act_tid: 4, vnic_interface_rss_config.0 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_RSS
+	},
+	/* cond_execute: act_tid: 4, vnic_interface_queue_config.0 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_QUEUE
+	},
+	/* cond_execute: act_tid: 4, int_full_act_record.0 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_QUEUE
+	},
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_RSS
+	},
+	/* cond_execute: act_tid: 6, shared_mirror_record.rd */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_SHARED_SAMPLE
+	},
+	/* cond_execute: act_tid: 6, control.mirror.0 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_RF_IS_SET,
+	.cond_operand = BNXT_ULP_RF_IDX_GENERIC_TBL_MISS
+	},
+	/* cond_execute: act_tid: 6, multi_shared_mirror_record.rd_a */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_MULTIPLE_PORT
+	},
+	/* cond_execute: act_tid: 6, control.mirror_port_a */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_RF_IS_SET,
+	.cond_operand = BNXT_ULP_RF_IDX_GENERIC_TBL_MISS
+	},
+	/* cond_execute: act_tid: 6, control.mirror_port_b */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_RF_IS_SET,
+	.cond_operand = BNXT_ULP_RF_IDX_GENERIC_TBL_MISS
+	},
+	/* cond_execute: act_tid: 6, control.set_dest_is_b_vfrep */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_CF_NOT_SET,
+	.cond_operand = BNXT_ULP_CF_IDX_MP_B_IS_VFREP
+	},
+	/* cond_execute: act_tid: 6, int_flow_counter_tbl.mirror */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_COUNT
+	},
+	/* cond_execute: act_tid: 6, int_full_act_record.mirr_2_vf */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_EXT_MEM_NOT_SET,
+	},
+	/* cond_execute: act_tid: 6, int_flow_counter_tbl.0 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_COUNT
+	},
+	/* cond_execute: act_tid: 6, int_vtag_encap_record.0 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_EXT_MEM_NOT_SET,
+	},
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_PUSH_VLAN
+	},
+	/* cond_execute: act_tid: 6, int_full_act_record.0 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_EXT_MEM_NOT_SET,
+	},
+	/* cond_execute: act_tid: 6, ext_full_act_record.no_tag */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_EXT_MEM_IS_SET,
+	},
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_NOT_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_PUSH_VLAN
+	},
+	/* cond_execute: act_tid: 6, ext_full_act_record.one_tag */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_EXT_MEM_IS_SET,
+	},
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_PUSH_VLAN
+	},
+	/* cond_reject: wh_plus, act_tid: 7 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_SET_MAC_DST
+	},
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_SET_MAC_SRC
+	},
+	/* cond_execute: act_tid: 7, control.0 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_SET_IPV4_DST
+	},
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_SET_TP_DST
+	},
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_NOT_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_SET_TP_SRC
+	},
+	/* cond_execute: act_tid: 7, shared_mirror_record.rd */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_SHARED_SAMPLE
+	},
+	/* cond_execute: act_tid: 7, control.mirror.0 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_RF_IS_SET,
+	.cond_operand = BNXT_ULP_RF_IDX_GENERIC_TBL_MISS
+	},
+	/* cond_execute: act_tid: 7, multi_shared_mirror_record.rd_a */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_MULTIPLE_PORT
+	},
+	/* cond_execute: act_tid: 7, control.mirror_port_a */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_RF_IS_SET,
+	.cond_operand = BNXT_ULP_RF_IDX_GENERIC_TBL_MISS
+	},
+	/* cond_execute: act_tid: 7, control.mirror_port_b */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_RF_IS_SET,
+	.cond_operand = BNXT_ULP_RF_IDX_GENERIC_TBL_MISS
+	},
+	/* cond_execute: act_tid: 7, control.set_dest_is_b_vfrep */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_CF_NOT_SET,
+	.cond_operand = BNXT_ULP_CF_IDX_MP_B_IS_VFREP
+	},
+	/* cond_execute: act_tid: 7, int_flow_counter_tbl.mirror */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_COUNT
+	},
+	/* cond_execute: act_tid: 7, int_full_act_record.mirr_2_vf */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_EXT_MEM_NOT_SET,
+	},
+	/* cond_execute: act_tid: 7, int_flow_counter_tbl.0 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_COUNT
+	},
+	/* cond_execute: act_tid: 7, act_modify_ipv4_src.0 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_SET_IPV4_SRC
+	},
+	/* cond_execute: act_tid: 7, act_modify_ipv4_dst.0 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_SET_IPV4_DST
+	},
+	/* cond_execute: act_tid: 7, int_full_act_record.0 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_EXT_MEM_NOT_SET,
+	},
+	/* cond_execute: act_tid: 7, ext_full_act_record.0 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_EXT_MEM_IS_SET,
+	},
+	/* cond_reject: wh_plus, act_tid: 8 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_SET_MAC_DST
+	},
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_SET_MAC_SRC
+	},
+	/* cond_execute: act_tid: 8, shared_mirror_record.rd */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_SHARED_SAMPLE
+	},
+	/* cond_execute: act_tid: 8, control.mirror.0 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_RF_IS_SET,
+	.cond_operand = BNXT_ULP_RF_IDX_GENERIC_TBL_MISS
+	},
+	/* cond_execute: act_tid: 8, multi_shared_mirror_record.rd_a */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_MULTIPLE_PORT
+	},
+	/* cond_execute: act_tid: 8, control.mirror_port_a */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_RF_IS_SET,
+	.cond_operand = BNXT_ULP_RF_IDX_GENERIC_TBL_MISS
+	},
+	/* cond_execute: act_tid: 8, control.mirror_port_b */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_RF_IS_SET,
+	.cond_operand = BNXT_ULP_RF_IDX_GENERIC_TBL_MISS
+	},
+	/* cond_execute: act_tid: 8, control.set_dest_is_b_vfrep */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_CF_NOT_SET,
+	.cond_operand = BNXT_ULP_CF_IDX_MP_B_IS_VFREP
+	},
+	/* cond_execute: act_tid: 8, int_flow_counter_tbl.mirror */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_COUNT
+	},
+	/* cond_execute: act_tid: 8, int_full_act_record.mirr_2_vf */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_EXT_MEM_NOT_SET,
+	},
+	/* cond_execute: act_tid: 8, int_flow_counter_tbl.0 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_COUNT
+	},
+	/* cond_execute: act_tid: 8, sp_smac_ipv4.0 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ENC_HDR_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_HDR_BIT_O_IPV4
+	},
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ENC_HDR_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_HDR_BIT_T_VXLAN
+	},
+	/* cond_execute: act_tid: 8, sp_smac_ipv6.0 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ENC_HDR_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_HDR_BIT_O_IPV6
+	},
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ENC_HDR_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_HDR_BIT_T_VXLAN
+	},
+	/* cond_execute: act_tid: 8, vxlan_encap_rec_cache.rd */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ENC_HDR_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_HDR_BIT_O_IPV4
+	},
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ENC_HDR_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_HDR_BIT_T_VXLAN
+	},
+	/* cond_execute: act_tid: 8, vxlan_encap_ipv6_rec_cache.rd */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ENC_HDR_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_HDR_BIT_O_IPV6
+	},
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ENC_HDR_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_HDR_BIT_T_VXLAN
+	},
+	/* cond_execute: act_tid: 8, control.vxlan */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_RF_IS_SET,
+	.cond_operand = BNXT_ULP_RF_IDX_GENERIC_TBL_MISS
+	},
+	/* cond_execute: act_tid: 8, int_tun_encap_record.0 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_EXT_MEM_NOT_SET,
+	},
+	/* cond_execute: act_tid: 8, vxlan_encap_rec_cache.wr */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ENC_HDR_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_HDR_BIT_O_IPV4
+	},
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ENC_HDR_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_HDR_BIT_T_VXLAN
+	},
+	/* cond_execute: act_tid: 8, vxlan_encap_ipv6_rec_cache.wr */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ENC_HDR_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_HDR_BIT_O_IPV6
+	},
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ENC_HDR_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_HDR_BIT_T_VXLAN
+	},
+	/* cond_execute: act_tid: 8, int_full_act_record.0 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_EXT_MEM_NOT_SET,
+	},
+	/* cond_execute: act_tid: 8, ext_full_act_record_vxlan.0 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_EXT_MEM_IS_SET,
+	},
+	/* cond_execute: act_tid: 9, shared_mirror_record.rd */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_SHARED_SAMPLE
+	},
+	/* cond_execute: act_tid: 9, control.mirror.0 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_SHARED_SAMPLE
+	},
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_RF_IS_SET,
+	.cond_operand = BNXT_ULP_RF_IDX_GENERIC_TBL_MISS
+	},
+	/* cond_execute: act_tid: 9, multi_shared_mirror_record.rd_a */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_MULTIPLE_PORT
+	},
+	/* cond_execute: act_tid: 9, control.mirror_port_a */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_RF_IS_SET,
+	.cond_operand = BNXT_ULP_RF_IDX_GENERIC_TBL_MISS
+	},
+	/* cond_execute: act_tid: 9, control.mirror_port_b */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_RF_IS_SET,
+	.cond_operand = BNXT_ULP_RF_IDX_GENERIC_TBL_MISS
+	},
+	/* cond_execute: act_tid: 9, int_flow_counter_tbl.mirror */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_COUNT
+	},
+	/* cond_execute: act_tid: 9, int_full_act_record.mirr_2_vf */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_EXT_MEM_NOT_SET,
+	},
+	/* cond_execute: act_tid: 9, int_flow_counter_tbl.0 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
+	.cond_operand = BNXT_ULP_ACT_BIT_COUNT
+	},
+	/* cond_execute: act_tid: 9, int_full_act_record.0 */
+	{
+	.cond_opcode = BNXT_ULP_COND_OPC_EXT_MEM_NOT_SET,
+	}
+};
+
+struct bnxt_ulp_mapper_key_info ulp_wh_plus_act_key_info_list[] = {
+	/* act_tid: 1, , table: shared_mirror_record.rd */
+	{
+	.field_info_mask = {
+		.description = "shared_index",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "shared_index",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+		.field_opr1 = {
+		(BNXT_ULP_ACT_PROP_IDX_SHARED_HANDLE >> 8) & 0xff,
+		BNXT_ULP_ACT_PROP_IDX_SHARED_HANDLE & 0xff}
+		}
+	},
+	/* act_tid: 1, , table: multi_shared_mirror_record.rd_a */
+	{
+	.field_info_mask = {
+		.description = "port_index",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "port_index",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+		.field_opr1 = {
+		(BNXT_ULP_CF_IDX_MP_PORT_A >> 8) & 0xff,
+		BNXT_ULP_CF_IDX_MP_PORT_A & 0xff}
+		}
+	},
+	/* act_tid: 1, , table: multi_shared_mirror_record.rd_b */
+	{
+	.field_info_mask = {
+		.description = "port_index",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "port_index",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+		.field_opr1 = {
+		(BNXT_ULP_CF_IDX_MP_PORT_B >> 8) & 0xff,
+		BNXT_ULP_CF_IDX_MP_PORT_B & 0xff}
+		}
+	},
+	/* act_tid: 1, , table: multi_shared_mirror_record.wr_b */
+	{
+	.field_info_mask = {
+		.description = "port_index",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "port_index",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+		.field_opr1 = {
+		(BNXT_ULP_CF_IDX_MP_PORT_B >> 8) & 0xff,
+		BNXT_ULP_CF_IDX_MP_PORT_B & 0xff}
+		}
+	},
+	/* act_tid: 2, , table: shared_mirror_record.wr */
+	{
+	.field_info_mask = {
+		.description = "shared_index",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "shared_index",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+		.field_opr1 = {
+		(BNXT_ULP_RF_IDX_MIRROR_PTR_0 >> 8) & 0xff,
+		BNXT_ULP_RF_IDX_MIRROR_PTR_0 & 0xff}
+		}
+	},
+	/* act_tid: 3, , table: multi_shared_mirror_record.rd_a */
+	{
+	.field_info_mask = {
+		.description = "port_index",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "port_index",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+		.field_opr1 = {
+		(BNXT_ULP_CF_IDX_MP_PORT_A >> 8) & 0xff,
+		BNXT_ULP_CF_IDX_MP_PORT_A & 0xff}
+		}
+	},
+	/* act_tid: 3, , table: multi_shared_mirror_record.rd_b */
+	{
+	.field_info_mask = {
+		.description = "port_index",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "port_index",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+		.field_opr1 = {
+		(BNXT_ULP_CF_IDX_MP_PORT_B >> 8) & 0xff,
+		BNXT_ULP_CF_IDX_MP_PORT_B & 0xff}
+		}
+	},
+	/* act_tid: 3, , table: multi_shared_mirror_record.wr_b */
+	{
+	.field_info_mask = {
+		.description = "port_index",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "port_index",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+		.field_opr1 = {
+		(BNXT_ULP_CF_IDX_MP_PORT_B >> 8) & 0xff,
+		BNXT_ULP_CF_IDX_MP_PORT_B & 0xff}
+		}
+	},
+	/* act_tid: 6, , table: shared_mirror_record.rd */
+	{
+	.field_info_mask = {
+		.description = "shared_index",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "shared_index",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+		.field_opr1 = {
+		(BNXT_ULP_ACT_PROP_IDX_SHARED_HANDLE >> 8) & 0xff,
+		BNXT_ULP_ACT_PROP_IDX_SHARED_HANDLE & 0xff}
+		}
+	},
+	/* act_tid: 6, , table: multi_shared_mirror_record.rd_a */
+	{
+	.field_info_mask = {
+		.description = "port_index",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "port_index",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+		.field_opr1 = {
+		(BNXT_ULP_CF_IDX_MP_PORT_A >> 8) & 0xff,
+		BNXT_ULP_CF_IDX_MP_PORT_A & 0xff}
+		}
+	},
+	/* act_tid: 6, , table: multi_shared_mirror_record.rd_b */
+	{
+	.field_info_mask = {
+		.description = "port_index",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "port_index",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+		.field_opr1 = {
+		(BNXT_ULP_CF_IDX_MP_PORT_B >> 8) & 0xff,
+		BNXT_ULP_CF_IDX_MP_PORT_B & 0xff}
+		}
+	},
+	/* act_tid: 6, , table: multi_shared_mirror_record.wr_b */
+	{
+	.field_info_mask = {
+		.description = "port_index",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "port_index",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+		.field_opr1 = {
+		(BNXT_ULP_CF_IDX_MP_PORT_B >> 8) & 0xff,
+		BNXT_ULP_CF_IDX_MP_PORT_B & 0xff}
+		}
+	},
+	/* act_tid: 7, , table: shared_mirror_record.rd */
+	{
+	.field_info_mask = {
+		.description = "shared_index",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "shared_index",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+		.field_opr1 = {
+		(BNXT_ULP_ACT_PROP_IDX_SHARED_HANDLE >> 8) & 0xff,
+		BNXT_ULP_ACT_PROP_IDX_SHARED_HANDLE & 0xff}
+		}
+	},
+	/* act_tid: 7, , table: multi_shared_mirror_record.rd_a */
+	{
+	.field_info_mask = {
+		.description = "port_index",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "port_index",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+		.field_opr1 = {
+		(BNXT_ULP_CF_IDX_MP_PORT_A >> 8) & 0xff,
+		BNXT_ULP_CF_IDX_MP_PORT_A & 0xff}
+		}
+	},
+	/* act_tid: 7, , table: multi_shared_mirror_record.rd_b */
+	{
+	.field_info_mask = {
+		.description = "port_index",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "port_index",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+		.field_opr1 = {
+		(BNXT_ULP_CF_IDX_MP_PORT_B >> 8) & 0xff,
+		BNXT_ULP_CF_IDX_MP_PORT_B & 0xff}
+		}
+	},
+	/* act_tid: 7, , table: multi_shared_mirror_record.wr_b */
+	{
+	.field_info_mask = {
+		.description = "port_index",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "port_index",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+		.field_opr1 = {
+		(BNXT_ULP_CF_IDX_MP_PORT_B >> 8) & 0xff,
+		BNXT_ULP_CF_IDX_MP_PORT_B & 0xff}
+		}
+	},
+	/* act_tid: 8, , table: shared_mirror_record.rd */
+	{
+	.field_info_mask = {
+		.description = "shared_index",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "shared_index",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+		.field_opr1 = {
+		(BNXT_ULP_ACT_PROP_IDX_SHARED_HANDLE >> 8) & 0xff,
+		BNXT_ULP_ACT_PROP_IDX_SHARED_HANDLE & 0xff}
+		}
+	},
+	/* act_tid: 8, , table: multi_shared_mirror_record.rd_a */
+	{
+	.field_info_mask = {
+		.description = "port_index",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "port_index",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+		.field_opr1 = {
+		(BNXT_ULP_CF_IDX_MP_PORT_A >> 8) & 0xff,
+		BNXT_ULP_CF_IDX_MP_PORT_A & 0xff}
+		}
+	},
+	/* act_tid: 8, , table: multi_shared_mirror_record.rd_b */
+	{
+	.field_info_mask = {
+		.description = "port_index",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "port_index",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+		.field_opr1 = {
+		(BNXT_ULP_CF_IDX_MP_PORT_B >> 8) & 0xff,
+		BNXT_ULP_CF_IDX_MP_PORT_B & 0xff}
+		}
+	},
+	/* act_tid: 8, , table: multi_shared_mirror_record.wr_b */
+	{
+	.field_info_mask = {
+		.description = "port_index",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "port_index",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+		.field_opr1 = {
+		(BNXT_ULP_CF_IDX_MP_PORT_B >> 8) & 0xff,
+		BNXT_ULP_CF_IDX_MP_PORT_B & 0xff}
+		}
+	},
+	/* act_tid: 8, , table: port_table.sp_rec_rd */
+	{
+	.field_info_mask = {
+		.description = "dev.port_id",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "dev.port_id",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+		.field_opr1 = {
+		(BNXT_ULP_CF_IDX_DEV_PORT_ID >> 8) & 0xff,
+		BNXT_ULP_CF_IDX_DEV_PORT_ID & 0xff}
+		}
+	},
+	/* act_tid: 8, , table: vxlan_encap_rec_cache.rd */
+	{
+	.field_info_mask = {
+		.description = "dmac",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "dmac",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+		.field_opr1 = {
+		(BNXT_ULP_ENC_FIELD_ETH_DMAC >> 8) & 0xff,
+		BNXT_ULP_ENC_FIELD_ETH_DMAC & 0xff}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "ipv4_dst_addr",
+		.field_bit_size = 32,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff,
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "ipv4_dst_addr",
+		.field_bit_size = 32,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+		.field_opr1 = {
+		(BNXT_ULP_ENC_FIELD_IPV4_DADDR >> 8) & 0xff,
+		BNXT_ULP_ENC_FIELD_IPV4_DADDR & 0xff}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "udp_sport",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff,
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "udp_sport",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+		.field_opr1 = {
+		(BNXT_ULP_ENC_FIELD_UDP_SPORT >> 8) & 0xff,
+		BNXT_ULP_ENC_FIELD_UDP_SPORT & 0xff}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "udp_dport",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff,
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "udp_dport",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+		.field_opr1 = {
+		(BNXT_ULP_ENC_FIELD_UDP_DPORT >> 8) & 0xff,
+		BNXT_ULP_ENC_FIELD_UDP_DPORT & 0xff}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "vni",
+		.field_bit_size = 24,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "vni",
+		.field_bit_size = 24,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+		.field_opr1 = {
+		(BNXT_ULP_ENC_FIELD_VXLAN_VNI >> 8) & 0xff,
+		BNXT_ULP_ENC_FIELD_VXLAN_VNI & 0xff}
+		}
+	},
+	/* act_tid: 8, , table: vxlan_encap_ipv6_rec_cache.rd */
+	{
+	.field_info_mask = {
+		.description = "dmac",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "dmac",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+		.field_opr1 = {
+		(BNXT_ULP_ENC_FIELD_ETH_DMAC >> 8) & 0xff,
+		BNXT_ULP_ENC_FIELD_ETH_DMAC & 0xff}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "ipv6_dst_addr",
+		.field_bit_size = 128,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "ipv6_dst_addr",
+		.field_bit_size = 128,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+		.field_opr1 = {
+		(BNXT_ULP_ENC_FIELD_IPV6_DADDR >> 8) & 0xff,
+		BNXT_ULP_ENC_FIELD_IPV6_DADDR & 0xff}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "udp_sport",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff,
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "udp_sport",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+		.field_opr1 = {
+		(BNXT_ULP_ENC_FIELD_UDP_SPORT >> 8) & 0xff,
+		BNXT_ULP_ENC_FIELD_UDP_SPORT & 0xff}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "udp_dport",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff,
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "udp_dport",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+		.field_opr1 = {
+		(BNXT_ULP_ENC_FIELD_UDP_DPORT >> 8) & 0xff,
+		BNXT_ULP_ENC_FIELD_UDP_DPORT & 0xff}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "vni",
+		.field_bit_size = 24,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "vni",
+		.field_bit_size = 24,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+		.field_opr1 = {
+		(BNXT_ULP_ENC_FIELD_VXLAN_VNI >> 8) & 0xff,
+		BNXT_ULP_ENC_FIELD_VXLAN_VNI & 0xff}
+		}
+	},
+	/* act_tid: 8, , table: vxlan_encap_rec_cache.wr */
+	{
+	.field_info_mask = {
+		.description = "dmac",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "dmac",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+		.field_opr1 = {
+		(BNXT_ULP_ENC_FIELD_ETH_DMAC >> 8) & 0xff,
+		BNXT_ULP_ENC_FIELD_ETH_DMAC & 0xff}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "ipv4_dst_addr",
+		.field_bit_size = 32,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff,
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "ipv4_dst_addr",
+		.field_bit_size = 32,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+		.field_opr1 = {
+		(BNXT_ULP_ENC_FIELD_IPV4_DADDR >> 8) & 0xff,
+		BNXT_ULP_ENC_FIELD_IPV4_DADDR & 0xff}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "udp_sport",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff,
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "udp_sport",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+		.field_opr1 = {
+		(BNXT_ULP_ENC_FIELD_UDP_SPORT >> 8) & 0xff,
+		BNXT_ULP_ENC_FIELD_UDP_SPORT & 0xff}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "udp_dport",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff,
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "udp_dport",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+		.field_opr1 = {
+		(BNXT_ULP_ENC_FIELD_UDP_DPORT >> 8) & 0xff,
+		BNXT_ULP_ENC_FIELD_UDP_DPORT & 0xff}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "vni",
+		.field_bit_size = 24,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "vni",
+		.field_bit_size = 24,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+		.field_opr1 = {
+		(BNXT_ULP_ENC_FIELD_VXLAN_VNI >> 8) & 0xff,
+		BNXT_ULP_ENC_FIELD_VXLAN_VNI & 0xff}
+		}
+	},
+	/* act_tid: 8, , table: vxlan_encap_ipv6_rec_cache.wr */
+	{
+	.field_info_mask = {
+		.description = "dmac",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "dmac",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+		.field_opr1 = {
+		(BNXT_ULP_ENC_FIELD_ETH_DMAC >> 8) & 0xff,
+		BNXT_ULP_ENC_FIELD_ETH_DMAC & 0xff}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "ipv6_dst_addr",
+		.field_bit_size = 128,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "ipv6_dst_addr",
+		.field_bit_size = 128,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+		.field_opr1 = {
+		(BNXT_ULP_ENC_FIELD_IPV6_DADDR >> 8) & 0xff,
+		BNXT_ULP_ENC_FIELD_IPV6_DADDR & 0xff}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "udp_sport",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff,
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "udp_sport",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+		.field_opr1 = {
+		(BNXT_ULP_ENC_FIELD_UDP_SPORT >> 8) & 0xff,
+		BNXT_ULP_ENC_FIELD_UDP_SPORT & 0xff}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "udp_dport",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff,
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "udp_dport",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+		.field_opr1 = {
+		(BNXT_ULP_ENC_FIELD_UDP_DPORT >> 8) & 0xff,
+		BNXT_ULP_ENC_FIELD_UDP_DPORT & 0xff}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "vni",
+		.field_bit_size = 24,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "vni",
+		.field_bit_size = 24,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+		.field_opr1 = {
+		(BNXT_ULP_ENC_FIELD_VXLAN_VNI >> 8) & 0xff,
+		BNXT_ULP_ENC_FIELD_VXLAN_VNI & 0xff}
+		}
+	},
+	/* act_tid: 9, , table: shared_mirror_record.rd */
+	{
+	.field_info_mask = {
+		.description = "shared_index",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "shared_index",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+		.field_opr1 = {
+		(BNXT_ULP_ACT_PROP_IDX_SHARED_HANDLE >> 8) & 0xff,
+		BNXT_ULP_ACT_PROP_IDX_SHARED_HANDLE & 0xff}
+		}
+	},
+	/* act_tid: 9, , table: multi_shared_mirror_record.rd_a */
+	{
+	.field_info_mask = {
+		.description = "port_index",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "port_index",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+		.field_opr1 = {
+		(BNXT_ULP_CF_IDX_MP_PORT_A >> 8) & 0xff,
+		BNXT_ULP_CF_IDX_MP_PORT_A & 0xff}
+		}
+	},
+	/* act_tid: 9, , table: multi_shared_mirror_record.rd_b */
+	{
+	.field_info_mask = {
+		.description = "port_index",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "port_index",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+		.field_opr1 = {
+		(BNXT_ULP_CF_IDX_MP_PORT_B >> 8) & 0xff,
+		BNXT_ULP_CF_IDX_MP_PORT_B & 0xff}
+		}
+	},
+	/* act_tid: 9, , table: multi_shared_mirror_record.wr_b */
+	{
+	.field_info_mask = {
+		.description = "port_index",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "port_index",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+		.field_opr1 = {
+		(BNXT_ULP_CF_IDX_MP_PORT_B >> 8) & 0xff,
+		BNXT_ULP_CF_IDX_MP_PORT_B & 0xff}
+		}
+	}
+};
+
+struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
+	/* act_tid: 1, , table: mirror_tbl.alloc */
+	{
+	.description = "act_rec_ptr",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "enable",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	1}
+	},
+	{
+	.description = "copy",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ign_drop",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "reserved",
+	.field_bit_size = 2,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "sp_ptr",
+	.field_bit_size = 11,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	/* act_tid: 1, , table: int_flow_counter_tbl.mirror */
+	{
+	.description = "count",
+	.field_bit_size = 64,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	/* act_tid: 1, , table: int_full_act_record.mirror */
+	{
+	.description = "flow_cntr_ptr",
+	.field_bit_size = 14,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_MIRR_FLOW_CNTR_PTR_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MIRR_FLOW_CNTR_PTR_0 & 0xff}
+	},
+	{
+	.description = "age_enable",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "agg_cntr_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "rate_cntr_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "flow_cntr_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_ACT_BIT_COUNT & 0xff}
+	},
+	{
+	.description = "tcpflags_key",
+	.field_bit_size = 8,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tcpflags_mir",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tcpflags_match",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "encap_ptr",
+	.field_bit_size = 11,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "dst_ip_ptr",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tcp_dst_port",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "src_ip_ptr",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tcp_src_port",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "meter_id",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "l3_rdir",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tl3_rdir",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "l3_ttl_dec",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tl3_ttl_dec",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "decap_func",
+	.field_bit_size = 4,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "vnic_or_vport",
+	.field_bit_size = 12,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+	.field_opr1 = {
+	(BNXT_ULP_CF_IDX_MP_VNIC_B >> 8) & 0xff,
+	BNXT_ULP_CF_IDX_MP_VNIC_B & 0xff}
+	},
+	{
+	.description = "pop_vlan",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "meter",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "mirror",
+	.field_bit_size = 2,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "drop",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "hit",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "type",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	/* act_tid: 1, , table: ext_full_act_record.mirror */
+	{
+	.description = "flow_cntr_ptr",
+	.field_bit_size = 14,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_MIRR_FLOW_CNTR_PTR_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MIRR_FLOW_CNTR_PTR_0 & 0xff}
+	},
+	{
+	.description = "age_enable",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "agg_cntr_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "rate_cntr_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "flow_cntr_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_ACT_BIT_COUNT & 0xff}
+	},
+	{
+	.description = "flow_cntr_ext",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tcpflags_key",
+	.field_bit_size = 8,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tcpflags_mir",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tcpflags_match",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "encap_ptr",
+	.field_bit_size = 11,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "encap_rec_int",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "dst_ip_ptr",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tcp_dst_port",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "src_ip_ptr",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tcp_src_port",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "meter_id",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "l3_rdir",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tl3_rdir",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "l3_ttl_dec",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tl3_ttl_dec",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "decap_func",
+	.field_bit_size = 4,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "vnic_or_vport",
+	.field_bit_size = 12,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+	.field_opr1 = {
+	(BNXT_ULP_CF_IDX_MP_VNIC_B >> 8) & 0xff,
+	BNXT_ULP_CF_IDX_MP_VNIC_B & 0xff}
+	},
+	{
+	.description = "pop_vlan",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN & 0xff}
+	},
+	{
+	.description = "meter",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "mirror",
+	.field_bit_size = 2,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "drop",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ecv_valid",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	ULP_WP_SYM_ECV_VALID_YES}
+	},
+	{
+	.description = "ecv_custom_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ecv_vtag_type",
+	.field_bit_size = 4,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ecv_l2_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ecv_l3_type",
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ecv_l4_type",
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ecv_tun_type",
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "vtag_tpid",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "vtag_pcp",
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "vtag_de",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "vtag_vid",
+	.field_bit_size = 12,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	/* act_tid: 1, , table: mirror_tbl.wr */
+	{
+	.description = "act_rec_ptr",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_MIRR_ACTION_PTR >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MIRR_ACTION_PTR & 0xff}
+	},
+	{
+	.description = "enable",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	1}
+	},
+	{
+	.description = "copy",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ign_drop",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "reserved",
+	.field_bit_size = 2,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "sp_ptr",
+	.field_bit_size = 11,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	/* act_tid: 1, , table: multi_shared_mirror_record.wr_b */
+	{
+	.description = "rid",
+	.field_bit_size = 32,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_RID >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_RID & 0xff}
+	},
+	{
+	.description = "mirror_id",
+	.field_bit_size = 4,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_MIRROR_ID_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MIRROR_ID_0 & 0xff}
+	},
+	/* act_tid: 1, , table: int_flow_counter_tbl.0 */
+	{
+	.description = "count",
+	.field_bit_size = 64,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	/* act_tid: 1, , table: int_vtag_encap_record.0 */
+	{
+	.description = "ecv_valid",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	ULP_WP_SYM_ECV_VALID_YES}
+	},
+	{
+	.description = "ecv_custom_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ecv_vtag_type",
+	.field_bit_size = 4,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	ULP_WP_SYM_ECV_VTAG_TYPE_ADD_1_ENCAP_PRI}
+	},
+	{
+	.description = "ecv_l2_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ecv_l3_type",
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ecv_l4_type",
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ecv_tun_type",
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "vtag_tpid",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+	.field_opr1 = {
+	(BNXT_ULP_ACT_PROP_IDX_PUSH_VLAN >> 8) & 0xff,
+	BNXT_ULP_ACT_PROP_IDX_PUSH_VLAN & 0xff}
+	},
+	{
+	.description = "vtag_pcp",
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+	.field_opr1 = {
+	(BNXT_ULP_ACT_PROP_IDX_SET_VLAN_PCP >> 8) & 0xff,
+	BNXT_ULP_ACT_PROP_IDX_SET_VLAN_PCP & 0xff}
+	},
+	{
+	.description = "vtag_de",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "vtag_vid",
+	.field_bit_size = 12,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+	.field_opr1 = {
+	(BNXT_ULP_ACT_PROP_IDX_SET_VLAN_VID >> 8) & 0xff,
+	BNXT_ULP_ACT_PROP_IDX_SET_VLAN_VID & 0xff}
+	},
+	/* act_tid: 1, , table: int_full_act_record.0 */
+	{
+	.description = "flow_cntr_ptr",
+	.field_bit_size = 14,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 & 0xff}
+	},
+	{
+	.description = "age_enable",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "agg_cntr_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "rate_cntr_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "flow_cntr_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_ACT_BIT_COUNT & 0xff}
+	},
+	{
+	.description = "tcpflags_key",
+	.field_bit_size = 8,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tcpflags_mir",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tcpflags_match",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "encap_ptr",
+	.field_bit_size = 11,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_ENCAP_PTR_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_ENCAP_PTR_0 & 0xff}
+	},
+	{
+	.description = "dst_ip_ptr",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 & 0xff}
+	},
+	{
+	.description = "tcp_dst_port",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST & 0xff},
+	.field_src2 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+	.field_opr2 = {
+	(BNXT_ULP_ACT_PROP_IDX_SET_TP_DST >> 8) & 0xff,
+	BNXT_ULP_ACT_PROP_IDX_SET_TP_DST & 0xff},
+	.field_src3 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "src_ip_ptr",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 & 0xff}
+	},
+	{
+	.description = "tcp_src_port",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC & 0xff},
+	.field_src2 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+	.field_opr2 = {
+	(BNXT_ULP_ACT_PROP_IDX_SET_TP_SRC >> 8) & 0xff,
+	BNXT_ULP_ACT_PROP_IDX_SET_TP_SRC & 0xff},
+	.field_src3 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "meter_id",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "l3_rdir",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tl3_rdir",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "l3_ttl_dec",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+	.field_opr1 = {
+	(BNXT_ULP_CF_IDX_ACT_DEC_TTL >> 8) & 0xff,
+	BNXT_ULP_CF_IDX_ACT_DEC_TTL & 0xff}
+	},
+	{
+	.description = "tl3_ttl_dec",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+	.field_opr1 = {
+	(BNXT_ULP_CF_IDX_ACT_T_DEC_TTL >> 8) & 0xff,
+	BNXT_ULP_CF_IDX_ACT_T_DEC_TTL & 0xff}
+	},
+	{
+	.description = "decap_func",
+	.field_bit_size = 4,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP & 0xff},
+	.field_src2 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr2 = {
+	ULP_WP_SYM_DECAP_FUNC_THRU_TUN},
+	.field_src3 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr3 = {
+	ULP_WP_SYM_DECAP_FUNC_NONE}
+	},
+	{
+	.description = "vnic_or_vport",
+	.field_bit_size = 12,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_DEST_VNIC >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_DEST_VNIC & 0xff}
+	},
+	{
+	.description = "pop_vlan",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN & 0xff}
+	},
+	{
+	.description = "meter",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "mirror",
+	.field_bit_size = 2,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_MIRROR_ID_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MIRROR_ID_0 & 0xff}
+	},
+	{
+	.description = "drop",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_ACT_BIT_DROP & 0xff}
+	},
+	{
+	.description = "hit",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "type",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	/* act_tid: 1, , table: ext_full_act_record.0 */
+	{
+	.description = "flow_cntr_ptr",
+	.field_bit_size = 14,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 & 0xff}
+	},
+	{
+	.description = "age_enable",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "agg_cntr_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "rate_cntr_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "flow_cntr_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_ACT_BIT_COUNT & 0xff}
+	},
+	{
+	.description = "flow_cntr_ext",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tcpflags_key",
+	.field_bit_size = 8,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tcpflags_mir",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tcpflags_match",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "encap_ptr",
+	.field_bit_size = 11,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "encap_rec_int",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "dst_ip_ptr",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 & 0xff}
+	},
+	{
+	.description = "tcp_dst_port",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST & 0xff},
+	.field_src2 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+	.field_opr2 = {
+	(BNXT_ULP_ACT_PROP_IDX_SET_TP_DST >> 8) & 0xff,
+	BNXT_ULP_ACT_PROP_IDX_SET_TP_DST & 0xff},
+	.field_src3 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "src_ip_ptr",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 & 0xff}
+	},
+	{
+	.description = "tcp_src_port",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC & 0xff},
+	.field_src2 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+	.field_opr2 = {
+	(BNXT_ULP_ACT_PROP_IDX_SET_TP_SRC >> 8) & 0xff,
+	BNXT_ULP_ACT_PROP_IDX_SET_TP_SRC & 0xff},
+	.field_src3 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "meter_id",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "l3_rdir",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tl3_rdir",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "l3_ttl_dec",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+	.field_opr1 = {
+	(BNXT_ULP_CF_IDX_ACT_DEC_TTL >> 8) & 0xff,
+	BNXT_ULP_CF_IDX_ACT_DEC_TTL & 0xff}
+	},
+	{
+	.description = "tl3_ttl_dec",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+	.field_opr1 = {
+	(BNXT_ULP_CF_IDX_ACT_T_DEC_TTL >> 8) & 0xff,
+	BNXT_ULP_CF_IDX_ACT_T_DEC_TTL & 0xff}
+	},
+	{
+	.description = "decap_func",
+	.field_bit_size = 4,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP & 0xff},
+	.field_src2 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr2 = {
+	ULP_WP_SYM_DECAP_FUNC_THRU_TUN},
+	.field_src3 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr3 = {
+	ULP_WP_SYM_DECAP_FUNC_NONE}
+	},
+	{
+	.description = "vnic_or_vport",
+	.field_bit_size = 12,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_DEST_VNIC >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_DEST_VNIC & 0xff}
+	},
+	{
+	.description = "pop_vlan",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN & 0xff}
+	},
+	{
+	.description = "meter",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "mirror",
+	.field_bit_size = 2,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_MIRROR_ID_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MIRROR_ID_0 & 0xff}
+	},
+	{
+	.description = "drop",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_ACT_BIT_DROP & 0xff}
+	},
+	{
+	.description = "ecv_valid",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	ULP_WP_SYM_ECV_VALID_YES}
+	},
+	{
+	.description = "ecv_custom_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ecv_vtag_type",
+	.field_bit_size = 4,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ecv_l2_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ecv_l3_type",
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ecv_l4_type",
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ecv_tun_type",
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "vtag_tpid",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "vtag_pcp",
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "vtag_de",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "vtag_vid",
+	.field_bit_size = 12,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	/* act_tid: 2, , table: mirror_tbl.alloc */
+	{
+	.description = "act_rec_ptr",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "enable",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	1}
+	},
+	{
+	.description = "copy",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ign_drop",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "reserved",
+	.field_bit_size = 2,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "sp_ptr",
+	.field_bit_size = 11,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	/* act_tid: 2, , table: int_flow_counter_tbl.0 */
+	{
+	.description = "count",
+	.field_bit_size = 64,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	/* act_tid: 2, , table: int_full_act_record.0 */
+	{
+	.description = "flow_cntr_ptr",
+	.field_bit_size = 14,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 & 0xff}
+	},
+	{
+	.description = "age_enable",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "agg_cntr_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "rate_cntr_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "flow_cntr_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_ACT_BIT_COUNT & 0xff}
+	},
+	{
+	.description = "tcpflags_key",
+	.field_bit_size = 8,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tcpflags_mir",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tcpflags_match",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "encap_ptr",
+	.field_bit_size = 11,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "dst_ip_ptr",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tcp_dst_port",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "src_ip_ptr",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tcp_src_port",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "meter_id",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "l3_rdir",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tl3_rdir",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "l3_ttl_dec",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tl3_ttl_dec",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "decap_func",
+	.field_bit_size = 4,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "vnic_or_vport",
+	.field_bit_size = 12,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+	.field_opr1 = {
+	(BNXT_ULP_ACT_PROP_IDX_VNIC >> 8) & 0xff,
+	BNXT_ULP_ACT_PROP_IDX_VNIC & 0xff}
+	},
+	{
+	.description = "pop_vlan",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "meter",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "mirror",
+	.field_bit_size = 2,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "drop",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "hit",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "type",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	/* act_tid: 2, , table: ext_full_act_record.0 */
+	{
+	.description = "flow_cntr_ptr",
+	.field_bit_size = 14,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 & 0xff}
+	},
+	{
+	.description = "age_enable",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "agg_cntr_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "rate_cntr_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "flow_cntr_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_ACT_BIT_COUNT & 0xff}
+	},
+	{
+	.description = "flow_cntr_ext",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tcpflags_key",
+	.field_bit_size = 8,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tcpflags_mir",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tcpflags_match",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "encap_ptr",
+	.field_bit_size = 11,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "encap_rec_int",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "dst_ip_ptr",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tcp_dst_port",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "src_ip_ptr",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tcp_src_port",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "meter_id",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "l3_rdir",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tl3_rdir",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "l3_ttl_dec",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tl3_ttl_dec",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "decap_func",
+	.field_bit_size = 4,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "vnic_or_vport",
+	.field_bit_size = 12,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+	.field_opr1 = {
+	(BNXT_ULP_ACT_PROP_IDX_VNIC >> 8) & 0xff,
+	BNXT_ULP_ACT_PROP_IDX_VNIC & 0xff}
+	},
+	{
+	.description = "pop_vlan",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN & 0xff}
+	},
+	{
+	.description = "meter",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "mirror",
+	.field_bit_size = 2,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "drop",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ecv_valid",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	ULP_WP_SYM_ECV_VALID_YES}
+	},
+	{
+	.description = "ecv_custom_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ecv_vtag_type",
+	.field_bit_size = 4,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ecv_l2_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ecv_l3_type",
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ecv_l4_type",
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ecv_tun_type",
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "vtag_tpid",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "vtag_pcp",
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "vtag_de",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "vtag_vid",
+	.field_bit_size = 12,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	/* act_tid: 2, , table: mirror_tbl.wr */
+	{
+	.description = "act_rec_ptr",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
+	},
+	{
+	.description = "enable",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	1}
+	},
+	{
+	.description = "copy",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ign_drop",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "reserved",
+	.field_bit_size = 2,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "sp_ptr",
+	.field_bit_size = 11,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	/* act_tid: 2, , table: shared_mirror_record.wr */
+	{
+	.description = "rid",
+	.field_bit_size = 32,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_RID >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_RID & 0xff}
+	},
+	{
+	.description = "mirror_id",
+	.field_bit_size = 4,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_PLUS_SRC2,
+	.field_src2 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr2 = {
+	1}
+	},
+	/* act_tid: 3, , table: mirror_tbl.alloc */
+	{
+	.description = "act_rec_ptr",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "enable",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	1}
+	},
+	{
+	.description = "copy",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ign_drop",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "reserved",
+	.field_bit_size = 2,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "sp_ptr",
+	.field_bit_size = 11,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	/* act_tid: 3, , table: int_flow_counter_tbl.mirror */
+	{
+	.description = "count",
+	.field_bit_size = 64,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	/* act_tid: 3, , table: int_full_act_record.mirror */
+	{
+	.description = "flow_cntr_ptr",
+	.field_bit_size = 14,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_MIRR_FLOW_CNTR_PTR_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MIRR_FLOW_CNTR_PTR_0 & 0xff}
+	},
+	{
+	.description = "age_enable",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "agg_cntr_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "rate_cntr_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "flow_cntr_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_ACT_BIT_COUNT & 0xff}
+	},
+	{
+	.description = "tcpflags_key",
+	.field_bit_size = 8,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tcpflags_mir",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tcpflags_match",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "encap_ptr",
+	.field_bit_size = 11,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "dst_ip_ptr",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tcp_dst_port",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "src_ip_ptr",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tcp_src_port",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "meter_id",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "l3_rdir",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tl3_rdir",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "l3_ttl_dec",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tl3_ttl_dec",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "decap_func",
+	.field_bit_size = 4,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "vnic_or_vport",
+	.field_bit_size = 12,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+	.field_opr1 = {
+	(BNXT_ULP_CF_IDX_MP_VNIC_B >> 8) & 0xff,
+	BNXT_ULP_CF_IDX_MP_VNIC_B & 0xff}
+	},
+	{
+	.description = "pop_vlan",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "meter",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "mirror",
+	.field_bit_size = 2,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "drop",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "hit",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "type",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	/* act_tid: 3, , table: ext_full_act_record.mirror */
+	{
+	.description = "flow_cntr_ptr",
+	.field_bit_size = 14,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_MIRR_FLOW_CNTR_PTR_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MIRR_FLOW_CNTR_PTR_0 & 0xff}
+	},
+	{
+	.description = "age_enable",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "agg_cntr_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "rate_cntr_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "flow_cntr_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_ACT_BIT_COUNT & 0xff}
+	},
+	{
+	.description = "flow_cntr_ext",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tcpflags_key",
+	.field_bit_size = 8,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tcpflags_mir",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tcpflags_match",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "encap_ptr",
+	.field_bit_size = 11,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "encap_rec_int",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "dst_ip_ptr",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tcp_dst_port",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "src_ip_ptr",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tcp_src_port",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "meter_id",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "l3_rdir",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tl3_rdir",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "l3_ttl_dec",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tl3_ttl_dec",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "decap_func",
+	.field_bit_size = 4,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "vnic_or_vport",
+	.field_bit_size = 12,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+	.field_opr1 = {
+	(BNXT_ULP_CF_IDX_MP_VNIC_B >> 8) & 0xff,
+	BNXT_ULP_CF_IDX_MP_VNIC_B & 0xff}
+	},
+	{
+	.description = "pop_vlan",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN & 0xff}
+	},
+	{
+	.description = "meter",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "mirror",
+	.field_bit_size = 2,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "drop",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ecv_valid",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	ULP_WP_SYM_ECV_VALID_YES}
+	},
+	{
+	.description = "ecv_custom_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ecv_vtag_type",
+	.field_bit_size = 4,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ecv_l2_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ecv_l3_type",
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ecv_l4_type",
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ecv_tun_type",
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "vtag_tpid",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "vtag_pcp",
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "vtag_de",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "vtag_vid",
+	.field_bit_size = 12,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	/* act_tid: 3, , table: mirror_tbl.wr */
+	{
+	.description = "act_rec_ptr",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_MIRR_ACTION_PTR >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MIRR_ACTION_PTR & 0xff}
+	},
+	{
+	.description = "enable",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	1}
+	},
+	{
+	.description = "copy",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ign_drop",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "reserved",
+	.field_bit_size = 2,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_SET_IPV6_SRC
+	.description = "sp_ptr",
+	.field_bit_size = 11,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
+	/* act_tid: 3, , table: multi_shared_mirror_record.wr_b */
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_SET_TP_SRC
+	.description = "rid",
+	.field_bit_size = 32,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_RID >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_RID & 0xff}
 	},
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_SET_IPV4_DST
+	.description = "mirror_id",
+	.field_bit_size = 4,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_MIRROR_ID_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MIRROR_ID_0 & 0xff}
 	},
+	/* act_tid: 3, , table: int_flow_counter_tbl.0 */
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_SET_IPV6_DST
+	.description = "count",
+	.field_bit_size = 64,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
+	/* act_tid: 3, , table: act_modify_ipv4_src.0 */
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_SET_TP_DST
+	.description = "ipv4_addr",
+	.field_bit_size = 32,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+	.field_opr1 = {
+	(BNXT_ULP_ACT_PROP_IDX_SET_IPV4_SRC >> 8) & 0xff,
+	BNXT_ULP_ACT_PROP_IDX_SET_IPV4_SRC & 0xff}
 	},
+	/* act_tid: 3, , table: act_modify_ipv4_dst.0 */
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_PUSH_VLAN
+	.description = "ipv4_addr",
+	.field_bit_size = 32,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+	.field_opr1 = {
+	(BNXT_ULP_ACT_PROP_IDX_SET_IPV4_DST >> 8) & 0xff,
+	BNXT_ULP_ACT_PROP_IDX_SET_IPV4_DST & 0xff}
 	},
+	/* act_tid: 3, , table: int_encap_mac_record.0 */
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_SET_VLAN_VID
+	.description = "ecv_valid",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	1}
 	},
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_SET_VLAN_PCP
+	.description = "ecv_custom_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_SET_MAC_DST
+	.description = "ecv_vtag_type",
+	.field_bit_size = 4,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_SET_MAC_SRC
+	.description = "ecv_l2_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	ULP_WP_SYM_ECV_L2_EN_YES}
 	},
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_METER
+	.description = "ecv_l3_type",
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* cond_execute: act_tid: 1, shared_mirror_record.rd */
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_SHARED_SAMPLE
+	.description = "ecv_l4_type",
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* cond_execute: act_tid: 1, int_flow_counter_tbl.0 */
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_COUNT
+	.description = "ecv_tun_type",
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* cond_execute: act_tid: 1, int_vtag_encap_record.0 */
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_PUSH_VLAN
+	.description = "vtag_tpid",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* cond_execute: act_tid: 1, int_full_act_record.0 */
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_EXT_MEM_NOT_SET,
+	.description = "vtag_pcp",
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* cond_execute: act_tid: 1, ext_full_act_record.0 */
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_EXT_MEM_IS_SET,
+	.description = "vtag_de",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* cond_execute: act_tid: 2, int_flow_counter_tbl.0 */
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_COUNT
+	.description = "vtag_vid",
+	.field_bit_size = 12,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* cond_reject: wh_plus, act_tid: 3 */
+	/* act_tid: 3, , table: int_full_act_record.0 */
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_SET_MAC_DST
+	.description = "flow_cntr_ptr",
+	.field_bit_size = 14,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 & 0xff}
 	},
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_SET_MAC_SRC
+	.description = "age_enable",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_SHARED_SAMPLE
+	.description = "agg_cntr_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* cond_execute: act_tid: 3, control.0 */
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_SET_IPV4_DST
+	.description = "rate_cntr_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_SET_TP_DST
+	.description = "flow_cntr_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_ACT_BIT_COUNT & 0xff}
 	},
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_NOT_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_SET_TP_SRC
+	.description = "tcpflags_key",
+	.field_bit_size = 8,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* cond_execute: act_tid: 3, int_flow_counter_tbl.0 */
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_COUNT
+	.description = "tcpflags_mir",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* cond_execute: act_tid: 3, act_modify_ipv4_src.0 */
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_SET_IPV4_SRC
+	.description = "tcpflags_match",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* cond_execute: act_tid: 3, act_modify_ipv4_dst.0 */
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_SET_IPV4_DST
+	.description = "encap_ptr",
+	.field_bit_size = 11,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
+	.field_opr1 = {
+	(BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR >> 8) & 0xff,
+	BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR & 0xff}
+	},
+	{
+	.description = "dst_ip_ptr",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 & 0xff}
+	},
+	{
+	.description = "tcp_dst_port",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST & 0xff},
+	.field_src2 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+	.field_opr2 = {
+	(BNXT_ULP_ACT_PROP_IDX_SET_TP_DST >> 8) & 0xff,
+	BNXT_ULP_ACT_PROP_IDX_SET_TP_DST & 0xff},
+	.field_src3 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "src_ip_ptr",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 & 0xff}
+	},
+	{
+	.description = "tcp_src_port",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC & 0xff},
+	.field_src2 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+	.field_opr2 = {
+	(BNXT_ULP_ACT_PROP_IDX_SET_TP_SRC >> 8) & 0xff,
+	BNXT_ULP_ACT_PROP_IDX_SET_TP_SRC & 0xff},
+	.field_src3 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* cond_execute: act_tid: 3, int_full_act_record.0 */
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_EXT_MEM_NOT_SET,
+	.description = "meter_id",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* cond_execute: act_tid: 3, ext_full_act_record.0 */
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_EXT_MEM_IS_SET,
+	.description = "l3_rdir",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* cond_reject: wh_plus, act_tid: 4 */
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_SHARED_SAMPLE
+	.description = "tl3_rdir",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* cond_execute: act_tid: 4, int_flow_counter_tbl.0 */
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_COUNT
+	.description = "l3_ttl_dec",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+	.field_opr1 = {
+	(BNXT_ULP_CF_IDX_ACT_DEC_TTL >> 8) & 0xff,
+	BNXT_ULP_CF_IDX_ACT_DEC_TTL & 0xff}
 	},
-	/* cond_execute: act_tid: 4, vnic_interface_rss_config.0 */
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_RSS
+	.description = "tl3_ttl_dec",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+	.field_opr1 = {
+	(BNXT_ULP_CF_IDX_ACT_T_DEC_TTL >> 8) & 0xff,
+	BNXT_ULP_CF_IDX_ACT_T_DEC_TTL & 0xff}
 	},
-	/* cond_execute: act_tid: 4, vnic_interface_queue_config.0 */
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_QUEUE
+	.description = "decap_func",
+	.field_bit_size = 4,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+	.field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN & 0xff},
+	.field_src2 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr2 = {
+	ULP_WP_SYM_DECAP_FUNC_THRU_TL2},
+	.field_src3 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr3 = {
+	ULP_WP_SYM_DECAP_FUNC_THRU_L2}
 	},
-	/* cond_execute: act_tid: 4, int_full_act_record.0 */
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_QUEUE
+	.description = "vnic_or_vport",
+	.field_bit_size = 12,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_DEST_VNIC >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_DEST_VNIC & 0xff}
 	},
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_RSS
+	.description = "pop_vlan",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* cond_execute: act_tid: 6, int_flow_counter_tbl.0 */
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_COUNT
+	.description = "meter",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* cond_execute: act_tid: 6, int_vtag_encap_record.0 */
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_EXT_MEM_NOT_SET,
+	.description = "mirror",
+	.field_bit_size = 2,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_MIRROR_ID_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MIRROR_ID_0 & 0xff}
 	},
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_PUSH_VLAN
+	.description = "drop",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* cond_execute: act_tid: 6, int_full_act_record.0 */
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_EXT_MEM_NOT_SET,
+	.description = "hit",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* cond_execute: act_tid: 6, ext_full_act_record.no_tag */
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_EXT_MEM_IS_SET,
+	.description = "type",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
+	/* act_tid: 3, , table: ext_full_act_record.0 */
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_NOT_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_PUSH_VLAN
+	.description = "flow_cntr_ptr",
+	.field_bit_size = 14,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 & 0xff}
 	},
-	/* cond_execute: act_tid: 6, ext_full_act_record.one_tag */
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_EXT_MEM_IS_SET,
+	.description = "age_enable",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_PUSH_VLAN
+	.description = "agg_cntr_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* cond_reject: wh_plus, act_tid: 7 */
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_SET_MAC_DST
+	.description = "rate_cntr_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_SET_MAC_SRC
+	.description = "flow_cntr_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_ACT_BIT_COUNT & 0xff}
 	},
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_SHARED_SAMPLE
+	.description = "flow_cntr_ext",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* cond_execute: act_tid: 7, control.0 */
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_SET_IPV4_DST
+	.description = "tcpflags_key",
+	.field_bit_size = 8,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_SET_TP_DST
+	.description = "tcpflags_mir",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_NOT_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_SET_TP_SRC
+	.description = "tcpflags_match",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* cond_execute: act_tid: 7, int_flow_counter_tbl.0 */
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_COUNT
+	.description = "encap_ptr",
+	.field_bit_size = 11,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
+	.field_opr1 = {
+	(BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR >> 8) & 0xff,
+	BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR & 0xff}
 	},
-	/* cond_execute: act_tid: 7, act_modify_ipv4_src.0 */
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_SET_IPV4_SRC
+	.description = "encap_rec_int",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	1}
 	},
-	/* cond_execute: act_tid: 7, act_modify_ipv4_dst.0 */
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_SET_IPV4_DST
+	.description = "dst_ip_ptr",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 & 0xff}
 	},
-	/* cond_execute: act_tid: 7, int_full_act_record.0 */
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_EXT_MEM_NOT_SET,
+	.description = "tcp_dst_port",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST & 0xff},
+	.field_src2 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+	.field_opr2 = {
+	(BNXT_ULP_ACT_PROP_IDX_SET_TP_DST >> 8) & 0xff,
+	BNXT_ULP_ACT_PROP_IDX_SET_TP_DST & 0xff},
+	.field_src3 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* cond_execute: act_tid: 7, ext_full_act_record.0 */
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_EXT_MEM_IS_SET,
+	.description = "src_ip_ptr",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 & 0xff}
 	},
-	/* cond_reject: wh_plus, act_tid: 8 */
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_SET_MAC_DST
+	.description = "tcp_src_port",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC & 0xff},
+	.field_src2 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+	.field_opr2 = {
+	(BNXT_ULP_ACT_PROP_IDX_SET_TP_SRC >> 8) & 0xff,
+	BNXT_ULP_ACT_PROP_IDX_SET_TP_SRC & 0xff},
+	.field_src3 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_SET_MAC_SRC
+	.description = "meter_id",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_SHARED_SAMPLE
+	.description = "l3_rdir",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* cond_execute: act_tid: 8, int_flow_counter_tbl.0 */
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_COUNT
+	.description = "tl3_rdir",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* cond_execute: act_tid: 8, sp_smac_ipv4.0 */
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_CF_IS_SET,
-	.cond_operand = BNXT_ULP_CF_IDX_ACT_ENCAP_IPV4_FLAG
+	.description = "l3_ttl_dec",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+	.field_opr1 = {
+	(BNXT_ULP_CF_IDX_ACT_DEC_TTL >> 8) & 0xff,
+	BNXT_ULP_CF_IDX_ACT_DEC_TTL & 0xff}
 	},
-	/* cond_execute: act_tid: 8, sp_smac_ipv6.0 */
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_CF_IS_SET,
-	.cond_operand = BNXT_ULP_CF_IDX_ACT_ENCAP_IPV6_FLAG
+	.description = "tl3_ttl_dec",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+	.field_opr1 = {
+	(BNXT_ULP_CF_IDX_ACT_T_DEC_TTL >> 8) & 0xff,
+	BNXT_ULP_CF_IDX_ACT_T_DEC_TTL & 0xff}
 	},
-	/* cond_execute: act_tid: 8, int_tun_encap_record.0 */
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_EXT_MEM_NOT_SET,
+	.description = "decap_func",
+	.field_bit_size = 4,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+	.field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN & 0xff},
+	.field_src2 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr2 = {
+	ULP_WP_SYM_DECAP_FUNC_THRU_TL2},
+	.field_src3 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr3 = {
+	ULP_WP_SYM_DECAP_FUNC_THRU_L2}
 	},
-	/* cond_execute: act_tid: 8, int_full_act_record.0 */
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_EXT_MEM_NOT_SET,
+	.description = "vnic_or_vport",
+	.field_bit_size = 12,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_DEST_VNIC >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_DEST_VNIC & 0xff}
 	},
-	/* cond_execute: act_tid: 8, ext_full_act_record_vxlan.0 */
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_EXT_MEM_IS_SET,
+	.description = "pop_vlan",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* cond_execute: act_tid: 9, int_flow_counter_tbl.0 */
 	{
-	.cond_opcode = BNXT_ULP_COND_OPC_ACT_BIT_IS_SET,
-	.cond_operand = BNXT_ULP_ACT_BIT_COUNT
+	.description = "meter",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* cond_execute: act_tid: 9, int_full_act_record.0 */
-	{
-	.cond_opcode = BNXT_ULP_COND_OPC_EXT_MEM_NOT_SET,
-	}
-};
-
-struct bnxt_ulp_mapper_key_info ulp_wh_plus_act_key_info_list[] = {
-	/* act_tid: 1, , table: shared_mirror_record.rd */
 	{
-	.field_info_mask = {
-		.description = "shared_index",
-		.field_bit_size = 1,
-		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-		.field_opr1 = {
-			0xff}
-		},
-	.field_info_spec = {
-		.description = "shared_index",
-		.field_bit_size = 1,
-		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
-		.field_opr1 = {
-		(BNXT_ULP_ACT_PROP_IDX_SHARED_HANDLE >> 8) & 0xff,
-		BNXT_ULP_ACT_PROP_IDX_SHARED_HANDLE & 0xff}
-		}
+	.description = "mirror",
+	.field_bit_size = 2,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_MIRROR_ID_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MIRROR_ID_0 & 0xff}
 	},
-	/* act_tid: 2, , table: shared_mirror_record.wr */
-	{
-	.field_info_mask = {
-		.description = "shared_index",
-		.field_bit_size = 1,
-		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-		.field_opr1 = {
-			0xff}
-		},
-	.field_info_spec = {
-		.description = "shared_index",
-		.field_bit_size = 1,
-		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_RF,
-		.field_opr1 = {
-		(BNXT_ULP_RF_IDX_MIRROR_PTR_0 >> 8) & 0xff,
-		BNXT_ULP_RF_IDX_MIRROR_PTR_0 & 0xff}
-		}
-	}
-};
-
-struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
-	/* act_tid: 1, , table: int_flow_counter_tbl.0 */
 	{
-	.description = "count",
-	.field_bit_size = 64,
+	.description = "drop",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* act_tid: 1, , table: int_vtag_encap_record.0 */
 	{
 	.description = "ecv_valid",
 	.field_bit_size = 1,
@@ -1345,9 +7262,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	.description = "ecv_vtag_type",
 	.field_bit_size = 4,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-	ULP_WP_SYM_ECV_VTAG_TYPE_ADD_1_ENCAP_PRI}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "ecv_l2_en",
@@ -1377,19 +7292,13 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	.description = "vtag_tpid",
 	.field_bit_size = 16,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
-	.field_opr1 = {
-	(BNXT_ULP_ACT_PROP_IDX_PUSH_VLAN >> 8) & 0xff,
-	BNXT_ULP_ACT_PROP_IDX_PUSH_VLAN & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "vtag_pcp",
 	.field_bit_size = 3,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
-	.field_opr1 = {
-	(BNXT_ULP_ACT_PROP_IDX_SET_VLAN_PCP >> 8) & 0xff,
-	BNXT_ULP_ACT_PROP_IDX_SET_VLAN_PCP & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "vtag_de",
@@ -1401,12 +7310,18 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	.description = "vtag_vid",
 	.field_bit_size = 12,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
-	.field_opr1 = {
-	(BNXT_ULP_ACT_PROP_IDX_SET_VLAN_VID >> 8) & 0xff,
-	BNXT_ULP_ACT_PROP_IDX_SET_VLAN_VID & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* act_tid: 1, , table: int_full_act_record.0 */
+	/* act_tid: 4, , table: int_flow_counter_tbl.0 */
+	{
+	.description = "count",
+	.field_bit_size = 64,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	/* act_tid: 4, , table: vnic_interface_rss_config.0 */
+	/* act_tid: 4, , table: vnic_interface_queue_config.0 */
+	/* act_tid: 4, , table: int_full_act_record.0 */
 	{
 	.description = "flow_cntr_ptr",
 	.field_bit_size = 14,
@@ -1471,68 +7386,31 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	.description = "encap_ptr",
 	.field_bit_size = 11,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
-	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_ENCAP_PTR_0 >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_ENCAP_PTR_0 & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "dst_ip_ptr",
 	.field_bit_size = 10,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
-	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "tcp_dst_port",
 	.field_bit_size = 16,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
-	.field_opr1 = {
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST & 0xff},
-	.field_src2 = BNXT_ULP_FIELD_SRC_ACT_PROP,
-	.field_opr2 = {
-	(BNXT_ULP_ACT_PROP_IDX_SET_TP_DST >> 8) & 0xff,
-	BNXT_ULP_ACT_PROP_IDX_SET_TP_DST & 0xff},
-	.field_src3 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "src_ip_ptr",
 	.field_bit_size = 10,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
-	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "tcp_src_port",
 	.field_bit_size = 16,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
-	.field_opr1 = {
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC & 0xff},
-	.field_src2 = BNXT_ULP_FIELD_SRC_ACT_PROP,
-	.field_opr2 = {
-	(BNXT_ULP_ACT_PROP_IDX_SET_TP_SRC >> 8) & 0xff,
-	BNXT_ULP_ACT_PROP_IDX_SET_TP_SRC & 0xff},
-	.field_src3 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "meter_id",
@@ -1554,66 +7432,36 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	},
 	{
 	.description = "l3_ttl_dec",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
-	.field_opr1 = {
-	(BNXT_ULP_CF_IDX_ACT_DEC_TTL >> 8) & 0xff,
-	BNXT_ULP_CF_IDX_ACT_DEC_TTL & 0xff}
-	},
-	{
-	.description = "tl3_ttl_dec",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
-	.field_opr1 = {
-	(BNXT_ULP_CF_IDX_ACT_T_DEC_TTL >> 8) & 0xff,
-	BNXT_ULP_CF_IDX_ACT_T_DEC_TTL & 0xff}
-	},
-	{
-	.description = "decap_func",
-	.field_bit_size = 4,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
-	.field_opr1 = {
-	((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP & 0xff},
-	.field_src2 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr2 = {
-	ULP_WP_SYM_DECAP_FUNC_THRU_TUN},
-	.field_src3 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr3 = {
-	ULP_WP_SYM_DECAP_FUNC_NONE}
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tl3_ttl_dec",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "decap_func",
+	.field_bit_size = 4,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "vnic_or_vport",
 	.field_bit_size = 12,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
 	.field_opr1 = {
-	(BNXT_ULP_ACT_PROP_IDX_VNIC >> 8) & 0xff,
-	BNXT_ULP_ACT_PROP_IDX_VNIC & 0xff}
+	(BNXT_ULP_RF_IDX_RSS_VNIC >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_RSS_VNIC & 0xff}
 	},
 	{
 	.description = "pop_vlan",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
-	.field_opr1 = {
-	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "meter",
@@ -1624,37 +7472,14 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	{
 	.description = "mirror",
 	.field_bit_size = 2,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
-	.field_opr1 = {
-	((uint64_t)BNXT_ULP_ACT_BIT_SHARED_SAMPLE >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SHARED_SAMPLE >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SHARED_SAMPLE >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SHARED_SAMPLE >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SHARED_SAMPLE >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SHARED_SAMPLE >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SHARED_SAMPLE >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_ACT_BIT_SHARED_SAMPLE & 0xff},
-	.field_src2 = BNXT_ULP_FIELD_SRC_RF,
-	.field_opr2 = {
-	(BNXT_ULP_RF_IDX_MIRROR_ID_0 >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_MIRROR_ID_0 & 0xff},
-	.field_src3 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "drop",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
-	.field_opr1 = {
-	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_ACT_BIT_DROP & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "hit",
@@ -1668,7 +7493,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* act_tid: 1, , table: ext_full_act_record.0 */
+	/* act_tid: 4, , table: int_full_act_record.1 */
 	{
 	.description = "flow_cntr_ptr",
 	.field_bit_size = 14,
@@ -1712,12 +7537,6 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	(uint64_t)BNXT_ULP_ACT_BIT_COUNT & 0xff}
 	},
 	{
-	.description = "flow_cntr_ext",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
 	.description = "tcpflags_key",
 	.field_bit_size = 8,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
@@ -1742,68 +7561,28 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "encap_rec_int",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
 	.description = "dst_ip_ptr",
 	.field_bit_size = 10,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
-	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "tcp_dst_port",
 	.field_bit_size = 16,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
-	.field_opr1 = {
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST & 0xff},
-	.field_src2 = BNXT_ULP_FIELD_SRC_ACT_PROP,
-	.field_opr2 = {
-	(BNXT_ULP_ACT_PROP_IDX_SET_TP_DST >> 8) & 0xff,
-	BNXT_ULP_ACT_PROP_IDX_SET_TP_DST & 0xff},
-	.field_src3 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "src_ip_ptr",
 	.field_bit_size = 10,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
-	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "tcp_src_port",
 	.field_bit_size = 16,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
-	.field_opr1 = {
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC & 0xff},
-	.field_src2 = BNXT_ULP_FIELD_SRC_ACT_PROP,
-	.field_opr2 = {
-	(BNXT_ULP_ACT_PROP_IDX_SET_TP_SRC >> 8) & 0xff,
-	BNXT_ULP_ACT_PROP_IDX_SET_TP_SRC & 0xff},
-	.field_src3 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "meter_id",
@@ -1827,40 +7606,19 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	.description = "l3_ttl_dec",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
-	.field_opr1 = {
-	(BNXT_ULP_CF_IDX_ACT_DEC_TTL >> 8) & 0xff,
-	BNXT_ULP_CF_IDX_ACT_DEC_TTL & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "tl3_ttl_dec",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
-	.field_opr1 = {
-	(BNXT_ULP_CF_IDX_ACT_T_DEC_TTL >> 8) & 0xff,
-	BNXT_ULP_CF_IDX_ACT_T_DEC_TTL & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "decap_func",
 	.field_bit_size = 4,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
-	.field_opr1 = {
-	((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_ACT_BIT_VXLAN_DECAP & 0xff},
-	.field_src2 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr2 = {
-	ULP_WP_SYM_DECAP_FUNC_THRU_TUN},
-	.field_src3 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr3 = {
-	ULP_WP_SYM_DECAP_FUNC_NONE}
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "vnic_or_vport",
@@ -1875,16 +7633,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	.description = "pop_vlan",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
-	.field_opr1 = {
-	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "meter",
@@ -1896,149 +7645,174 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	.description = "mirror",
 	.field_bit_size = 2,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
-	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_MIRROR_ID_0 >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_MIRROR_ID_0 & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "drop",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
-	.field_opr1 = {
-	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_ACT_BIT_DROP & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "ecv_valid",
+	.description = "hit",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-	ULP_WP_SYM_ECV_VALID_YES}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "ecv_custom_en",
+	.description = "type",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
+	/* act_tid: 6, , table: mirror_tbl.alloc */
 	{
-	.description = "ecv_vtag_type",
-	.field_bit_size = 4,
+	.description = "act_rec_ptr",
+	.field_bit_size = 16,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "ecv_l2_en",
+	.description = "enable",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	1}
 	},
 	{
-	.description = "ecv_l3_type",
-	.field_bit_size = 3,
+	.description = "copy",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "ecv_l4_type",
-	.field_bit_size = 3,
+	.description = "ign_drop",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "ecv_tun_type",
-	.field_bit_size = 3,
+	.description = "reserved",
+	.field_bit_size = 2,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "vtag_tpid",
-	.field_bit_size = 16,
+	.description = "sp_ptr",
+	.field_bit_size = 11,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
+	/* act_tid: 6, , table: int_flow_counter_tbl.mirror */
 	{
-	.description = "vtag_pcp",
-	.field_bit_size = 3,
+	.description = "count",
+	.field_bit_size = 64,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
+	/* act_tid: 6, , table: int_encap_custom_record.mirr_2_vf */
 	{
-	.description = "vtag_de",
+	.description = "ecv_valid",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	ULP_WP_SYM_ECV_VALID_YES}
 	},
 	{
-	.description = "vtag_vid",
-	.field_bit_size = 12,
+	.description = "ecv_custom_en",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	ULP_WP_SYM_ECV_CUSTOM_EN_YES}
 	},
-	/* act_tid: 2, , table: mirror_tbl.alloc */
 	{
-	.description = "act_rec_ptr",
-	.field_bit_size = 16,
+	.description = "ecv_vtag_type",
+	.field_bit_size = 4,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "enable",
+	.description = "ecv_l2_en",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-	1}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "copy",
-	.field_bit_size = 1,
+	.description = "ecv_l3_type",
+	.field_bit_size = 3,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "ign_drop",
-	.field_bit_size = 1,
+	.description = "ecv_l4_type",
+	.field_bit_size = 3,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "reserved",
-	.field_bit_size = 2,
+	.description = "ecv_tun_type",
+	.field_bit_size = 3,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "sp_ptr",
-	.field_bit_size = 11,
+	.description = "encap_l2_dmac",
+	.field_bit_size = 48,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+		0x00,
+		0x0a,
+		0xf7,
+		0xaa,
+		0x10,
+		0x01}
+	},
+	{
+	.description = "encap_l2_smac",
+	.field_bit_size = 48,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+		0x00,
+		0x0a,
+		0xf7,
+		0xaa,
+		0x10,
+		0x00}
+	},
+	{
+	.description = "encap_l2_etype",
+	.field_bit_size = 16,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+		0xff,
+		0xff}
 	},
-	/* act_tid: 2, , table: int_flow_counter_tbl.0 */
 	{
-	.description = "count",
-	.field_bit_size = 64,
+	.description = "encap_l2_pair_id",
+	.field_bit_size = 16,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_PORT_TABLE,
+	.field_opr1 = {
+		(BNXT_ULP_CF_IDX_MP_PORT_B >> 8) & 0xff,
+		BNXT_ULP_CF_IDX_MP_PORT_B & 0xff,
+		(BNXT_ULP_PORT_TABLE_VF_FUNC_METADATA >> 8) & 0xff,
+		BNXT_ULP_PORT_TABLE_VF_FUNC_METADATA & 0xff}
 	},
-	/* act_tid: 2, , table: int_full_act_record.0 */
+	/* act_tid: 6, , table: int_full_act_record.mirr_2_vf */
 	{
 	.description = "flow_cntr_ptr",
 	.field_bit_size = 14,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
 	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 & 0xff}
+	(BNXT_ULP_RF_IDX_MIRR_FLOW_CNTR_PTR_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MIRR_FLOW_CNTR_PTR_0 & 0xff}
 	},
 	{
 	.description = "age_enable",
@@ -2095,7 +7869,10 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	.description = "encap_ptr",
 	.field_bit_size = 11,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_MIRR_ENCAP_PTR_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MIRR_ENCAP_PTR_0 & 0xff}
 	},
 	{
 	.description = "dst_ip_ptr",
@@ -2161,10 +7938,10 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	.description = "vnic_or_vport",
 	.field_bit_size = 12,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
-	(BNXT_ULP_ACT_PROP_IDX_VNIC >> 8) & 0xff,
-	BNXT_ULP_ACT_PROP_IDX_VNIC & 0xff}
+	(ULP_WP_SYM_LOOPBACK_PORT >> 8) & 0xff,
+	ULP_WP_SYM_LOOPBACK_PORT & 0xff}
 	},
 	{
 	.description = "pop_vlan",
@@ -2181,10 +7958,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	{
 	.description = "mirror",
 	.field_bit_size = 2,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_PLUS_SRC2,
-	.field_src2 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr2 = {
-	1}
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "drop",
@@ -2204,196 +7979,82 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* act_tid: 2, , table: ext_full_act_record.0 */
+	/* act_tid: 6, , table: mirror_tbl.wr */
 	{
-	.description = "flow_cntr_ptr",
-	.field_bit_size = 14,
+	.description = "act_rec_ptr",
+	.field_bit_size = 16,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
 	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 & 0xff}
+	(BNXT_ULP_RF_IDX_MIRR_ACTION_PTR >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MIRR_ACTION_PTR & 0xff}
 	},
 	{
-	.description = "age_enable",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "agg_cntr_en",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "rate_cntr_en",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "flow_cntr_en",
+	.description = "enable",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
-	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_ACT_BIT_COUNT & 0xff}
+	1}
 	},
 	{
-	.description = "flow_cntr_ext",
+	.description = "copy",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tcpflags_key",
-	.field_bit_size = 8,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "tcpflags_mir",
+	.description = "ign_drop",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tcpflags_match",
-	.field_bit_size = 1,
+	.description = "reserved",
+	.field_bit_size = 2,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "encap_ptr",
+	.description = "sp_ptr",
 	.field_bit_size = 11,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
+	/* act_tid: 6, , table: multi_shared_mirror_record.wr_b */
 	{
-	.description = "encap_rec_int",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "dst_ip_ptr",
-	.field_bit_size = 10,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "tcp_dst_port",
-	.field_bit_size = 16,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "src_ip_ptr",
-	.field_bit_size = 10,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "tcp_src_port",
-	.field_bit_size = 16,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "meter_id",
-	.field_bit_size = 10,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "l3_rdir",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "tl3_rdir",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "l3_ttl_dec",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "tl3_ttl_dec",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "decap_func",
-	.field_bit_size = 4,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "vnic_or_vport",
-	.field_bit_size = 12,
+	.description = "rid",
+	.field_bit_size = 32,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
 	.field_opr1 = {
-	(BNXT_ULP_ACT_PROP_IDX_VNIC >> 8) & 0xff,
-	BNXT_ULP_ACT_PROP_IDX_VNIC & 0xff}
+	(BNXT_ULP_RF_IDX_RID >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_RID & 0xff}
 	},
 	{
-	.description = "pop_vlan",
-	.field_bit_size = 1,
+	.description = "mirror_id",
+	.field_bit_size = 4,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
 	.field_opr1 = {
-	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN & 0xff}
-	},
-	{
-	.description = "meter",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "mirror",
-	.field_bit_size = 2,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_PLUS_SRC2,
-	.field_src2 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr2 = {
-	1}
+	(BNXT_ULP_RF_IDX_MIRROR_ID_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MIRROR_ID_0 & 0xff}
 	},
+	/* act_tid: 6, , table: int_flow_counter_tbl.0 */
 	{
-	.description = "drop",
-	.field_bit_size = 1,
+	.description = "count",
+	.field_bit_size = 64,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
+	/* act_tid: 6, , table: int_vtag_encap_record.0 */
 	{
 	.description = "ecv_valid",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
-	ULP_WP_SYM_ECV_VALID_YES}
+	1}
 	},
 	{
 	.description = "ecv_custom_en",
@@ -2405,7 +8066,9 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	.description = "ecv_vtag_type",
 	.field_bit_size = 4,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	ULP_WP_SYM_ECV_VTAG_TYPE_ADD_1_ENCAP_PRI}
 	},
 	{
 	.description = "ecv_l2_en",
@@ -2435,13 +8098,19 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	.description = "vtag_tpid",
 	.field_bit_size = 16,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+	.field_opr1 = {
+	(BNXT_ULP_ACT_PROP_IDX_PUSH_VLAN >> 8) & 0xff,
+	BNXT_ULP_ACT_PROP_IDX_PUSH_VLAN & 0xff}
 	},
 	{
 	.description = "vtag_pcp",
 	.field_bit_size = 3,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+	.field_opr1 = {
+	(BNXT_ULP_ACT_PROP_IDX_SET_VLAN_PCP >> 8) & 0xff,
+	BNXT_ULP_ACT_PROP_IDX_SET_VLAN_PCP & 0xff}
 	},
 	{
 	.description = "vtag_de",
@@ -2453,168 +8122,205 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	.description = "vtag_vid",
 	.field_bit_size = 12,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+	.field_opr1 = {
+	(BNXT_ULP_ACT_PROP_IDX_SET_VLAN_VID >> 8) & 0xff,
+	BNXT_ULP_ACT_PROP_IDX_SET_VLAN_VID & 0xff}
 	},
-	/* act_tid: 2, , table: mirror_tbl.wr */
+	/* act_tid: 6, , table: int_full_act_record.0 */
 	{
-	.description = "act_rec_ptr",
-	.field_bit_size = 16,
+	.description = "flow_cntr_ptr",
+	.field_bit_size = 14,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
 	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
+	(BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 & 0xff}
 	},
 	{
-	.description = "enable",
+	.description = "age_enable",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-	1}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "copy",
+	.description = "agg_cntr_en",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "ign_drop",
+	.description = "rate_cntr_en",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "reserved",
-	.field_bit_size = 2,
+	.description = "flow_cntr_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_ACT_BIT_COUNT & 0xff}
+	},
+	{
+	.description = "tcpflags_key",
+	.field_bit_size = 8,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tcpflags_mir",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "sp_ptr",
-	.field_bit_size = 11,
+	.description = "tcpflags_match",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* act_tid: 2, , table: shared_mirror_record.wr */
 	{
-	.description = "rid",
-	.field_bit_size = 32,
+	.description = "encap_ptr",
+	.field_bit_size = 11,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
 	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_RID >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_RID & 0xff}
+	(BNXT_ULP_RF_IDX_ENCAP_PTR_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_ENCAP_PTR_0 & 0xff}
 	},
 	{
-	.description = "mirror_id",
-	.field_bit_size = 2,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_PLUS_SRC2_POST,
-	.field_src2 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr2 = {
-	(1 >> 8) & 0xff,
-	1 & 0xff}
+	.description = "dst_ip_ptr",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* act_tid: 3, , table: int_flow_counter_tbl.0 */
 	{
-	.description = "count",
-	.field_bit_size = 64,
+	.description = "tcp_dst_port",
+	.field_bit_size = 16,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* act_tid: 3, , table: act_modify_ipv4_src.0 */
 	{
-	.description = "ipv4_addr",
-	.field_bit_size = 32,
+	.description = "src_ip_ptr",
+	.field_bit_size = 10,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
-	.field_opr1 = {
-	(BNXT_ULP_ACT_PROP_IDX_SET_IPV4_SRC >> 8) & 0xff,
-	BNXT_ULP_ACT_PROP_IDX_SET_IPV4_SRC & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* act_tid: 3, , table: act_modify_ipv4_dst.0 */
 	{
-	.description = "ipv4_addr",
-	.field_bit_size = 32,
+	.description = "tcp_src_port",
+	.field_bit_size = 16,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
-	.field_opr1 = {
-	(BNXT_ULP_ACT_PROP_IDX_SET_IPV4_DST >> 8) & 0xff,
-	BNXT_ULP_ACT_PROP_IDX_SET_IPV4_DST & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* act_tid: 3, , table: int_encap_vlan_record.0 */
 	{
-	.description = "ecv_valid",
-	.field_bit_size = 1,
+	.description = "meter_id",
+	.field_bit_size = 10,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-	1}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "ecv_custom_en",
+	.description = "l3_rdir",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "ecv_vtag_type",
-	.field_bit_size = 4,
+	.description = "tl3_rdir",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "ecv_l2_en",
+	.description = "l3_ttl_dec",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
 	.field_opr1 = {
-	ULP_WP_SYM_ECV_L2_EN_YES}
+	(BNXT_ULP_CF_IDX_ACT_DEC_TTL >> 8) & 0xff,
+	BNXT_ULP_CF_IDX_ACT_DEC_TTL & 0xff}
 	},
 	{
-	.description = "ecv_l3_type",
-	.field_bit_size = 3,
+	.description = "tl3_ttl_dec",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+	.field_opr1 = {
+	(BNXT_ULP_CF_IDX_ACT_T_DEC_TTL >> 8) & 0xff,
+	BNXT_ULP_CF_IDX_ACT_T_DEC_TTL & 0xff}
 	},
 	{
-	.description = "ecv_l4_type",
-	.field_bit_size = 3,
+	.description = "decap_func",
+	.field_bit_size = 4,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "ecv_tun_type",
-	.field_bit_size = 3,
+	.description = "vnic_or_vport",
+	.field_bit_size = 12,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_DEST_VPORT >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_DEST_VPORT & 0xff}
 	},
 	{
-	.description = "vtag_tpid",
-	.field_bit_size = 16,
+	.description = "pop_vlan",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "vtag_pcp",
-	.field_bit_size = 3,
+	.description = "meter",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "vtag_de",
+	.description = "mirror",
+	.field_bit_size = 2,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_MIRROR_ID_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MIRROR_ID_0 & 0xff}
+	},
+	{
+	.description = "drop",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_ACT_BIT_DROP & 0xff}
+	},
+	{
+	.description = "hit",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "vtag_vid",
-	.field_bit_size = 12,
+	.description = "type",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* act_tid: 3, , table: int_full_act_record.0 */
+	/* act_tid: 6, , table: ext_full_act_record.no_tag */
 	{
 	.description = "flow_cntr_ptr",
 	.field_bit_size = 14,
@@ -2658,6 +8364,12 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	(uint64_t)BNXT_ULP_ACT_BIT_COUNT & 0xff}
 	},
 	{
+	.description = "flow_cntr_ext",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
 	.description = "tcpflags_key",
 	.field_bit_size = 8,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
@@ -2679,68 +8391,37 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	.description = "encap_ptr",
 	.field_bit_size = 11,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
-	.field_opr1 = {
-	(BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR >> 8) & 0xff,
-	BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "encap_rec_int",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "dst_ip_ptr",
 	.field_bit_size = 10,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
-	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "tcp_dst_port",
 	.field_bit_size = 16,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
-	.field_opr1 = {
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST & 0xff},
-	.field_src2 = BNXT_ULP_FIELD_SRC_ACT_PROP,
-	.field_opr2 = {
-	(BNXT_ULP_ACT_PROP_IDX_SET_TP_DST >> 8) & 0xff,
-	BNXT_ULP_ACT_PROP_IDX_SET_TP_DST & 0xff},
-	.field_src3 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "src_ip_ptr",
 	.field_bit_size = 10,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
-	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "tcp_src_port",
 	.field_bit_size = 16,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
-	.field_opr1 = {
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC & 0xff},
-	.field_src2 = BNXT_ULP_FIELD_SRC_ACT_PROP,
-	.field_opr2 = {
-	(BNXT_ULP_ACT_PROP_IDX_SET_TP_SRC >> 8) & 0xff,
-	BNXT_ULP_ACT_PROP_IDX_SET_TP_SRC & 0xff},
-	.field_src3 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "meter_id",
@@ -2770,81 +8451,134 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	BNXT_ULP_CF_IDX_ACT_DEC_TTL & 0xff}
 	},
 	{
-	.description = "tl3_ttl_dec",
+	.description = "tl3_ttl_dec",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+	.field_opr1 = {
+	(BNXT_ULP_CF_IDX_ACT_T_DEC_TTL >> 8) & 0xff,
+	BNXT_ULP_CF_IDX_ACT_T_DEC_TTL & 0xff}
+	},
+	{
+	.description = "decap_func",
+	.field_bit_size = 4,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "vnic_or_vport",
+	.field_bit_size = 12,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_DEST_VPORT >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_DEST_VPORT & 0xff}
+	},
+	{
+	.description = "pop_vlan",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "meter",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "mirror",
+	.field_bit_size = 2,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_MIRROR_ID_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MIRROR_ID_0 & 0xff}
+	},
+	{
+	.description = "drop",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_ACT_BIT_DROP & 0xff}
+	},
+	{
+	.description = "ecv_valid",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	ULP_WP_SYM_ECV_VALID_YES}
+	},
+	{
+	.description = "ecv_custom_en",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
-	.field_opr1 = {
-	(BNXT_ULP_CF_IDX_ACT_T_DEC_TTL >> 8) & 0xff,
-	BNXT_ULP_CF_IDX_ACT_T_DEC_TTL & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "decap_func",
+	.description = "ecv_vtag_type",
 	.field_bit_size = 4,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-	.field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,
-	.field_opr1 = {
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN & 0xff},
-	.field_src2 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr2 = {
-	ULP_WP_SYM_DECAP_FUNC_THRU_TL2},
-	.field_src3 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr3 = {
-	ULP_WP_SYM_DECAP_FUNC_THRU_L2}
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "vnic_or_vport",
-	.field_bit_size = 12,
+	.description = "ecv_l2_en",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
-	.field_opr1 = {
-	(BNXT_ULP_ACT_PROP_IDX_VNIC >> 8) & 0xff,
-	BNXT_ULP_ACT_PROP_IDX_VNIC & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "pop_vlan",
-	.field_bit_size = 1,
+	.description = "ecv_l3_type",
+	.field_bit_size = 3,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "meter",
-	.field_bit_size = 1,
+	.description = "ecv_l4_type",
+	.field_bit_size = 3,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "mirror",
-	.field_bit_size = 2,
+	.description = "ecv_tun_type",
+	.field_bit_size = 3,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "drop",
-	.field_bit_size = 1,
+	.description = "vtag_tpid",
+	.field_bit_size = 16,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "hit",
-	.field_bit_size = 1,
+	.description = "vtag_pcp",
+	.field_bit_size = 3,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "type",
+	.description = "vtag_de",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* act_tid: 3, , table: ext_full_act_record.0 */
+	{
+	.description = "vtag_vid",
+	.field_bit_size = 12,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	/* act_tid: 6, , table: ext_full_act_record.one_tag */
 	{
 	.description = "flow_cntr_ptr",
 	.field_bit_size = 14,
@@ -2915,76 +8649,37 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	.description = "encap_ptr",
 	.field_bit_size = 11,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
-	.field_opr1 = {
-	(BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR >> 8) & 0xff,
-	BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "encap_rec_int",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-	1}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "dst_ip_ptr",
 	.field_bit_size = 10,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
-	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "tcp_dst_port",
 	.field_bit_size = 16,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
-	.field_opr1 = {
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST & 0xff},
-	.field_src2 = BNXT_ULP_FIELD_SRC_ACT_PROP,
-	.field_opr2 = {
-	(BNXT_ULP_ACT_PROP_IDX_SET_TP_DST >> 8) & 0xff,
-	BNXT_ULP_ACT_PROP_IDX_SET_TP_DST & 0xff},
-	.field_src3 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "src_ip_ptr",
 	.field_bit_size = 10,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
-	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "tcp_src_port",
 	.field_bit_size = 16,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
-	.field_opr1 = {
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC & 0xff},
-	.field_src2 = BNXT_ULP_FIELD_SRC_ACT_PROP,
-	.field_opr2 = {
-	(BNXT_ULP_ACT_PROP_IDX_SET_TP_SRC >> 8) & 0xff,
-	BNXT_ULP_ACT_PROP_IDX_SET_TP_SRC & 0xff},
-	.field_src3 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "meter_id",
@@ -3025,38 +8720,32 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	{
 	.description = "decap_func",
 	.field_bit_size = 4,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-	.field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,
-	.field_opr1 = {
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN & 0xff},
-	.field_src2 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr2 = {
-	ULP_WP_SYM_DECAP_FUNC_THRU_TL2},
-	.field_src3 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr3 = {
-	ULP_WP_SYM_DECAP_FUNC_THRU_L2}
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "vnic_or_vport",
 	.field_bit_size = 12,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
 	.field_opr1 = {
-	(BNXT_ULP_ACT_PROP_IDX_VNIC >> 8) & 0xff,
-	BNXT_ULP_ACT_PROP_IDX_VNIC & 0xff}
+	(BNXT_ULP_RF_IDX_DEST_VPORT >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_DEST_VPORT & 0xff}
 	},
 	{
 	.description = "pop_vlan",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN & 0xff}
 	},
 	{
 	.description = "meter",
@@ -3068,13 +8757,25 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	.description = "mirror",
 	.field_bit_size = 2,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_MIRROR_ID_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MIRROR_ID_0 & 0xff}
 	},
 	{
 	.description = "drop",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_ACT_BIT_DROP & 0xff}
 	},
 	{
 	.description = "ecv_valid",
@@ -3082,7 +8783,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
-	ULP_WP_SYM_ECV_VALID_YES}
+	1}
 	},
 	{
 	.description = "ecv_custom_en",
@@ -3094,7 +8795,9 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	.description = "ecv_vtag_type",
 	.field_bit_size = 4,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	ULP_WP_SYM_ECV_VTAG_TYPE_ADD_1_ENCAP_PRI}
 	},
 	{
 	.description = "ecv_l2_en",
@@ -3124,216 +8827,183 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	.description = "vtag_tpid",
 	.field_bit_size = 16,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+	.field_opr1 = {
+	(BNXT_ULP_ACT_PROP_IDX_PUSH_VLAN >> 8) & 0xff,
+	BNXT_ULP_ACT_PROP_IDX_PUSH_VLAN & 0xff}
 	},
 	{
 	.description = "vtag_pcp",
 	.field_bit_size = 3,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "vtag_de",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "vtag_vid",
-	.field_bit_size = 12,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	/* act_tid: 4, , table: int_flow_counter_tbl.0 */
-	{
-	.description = "count",
-	.field_bit_size = 64,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	/* act_tid: 4, , table: vnic_interface_rss_config.0 */
-	/* act_tid: 4, , table: vnic_interface_queue_config.0 */
-	/* act_tid: 4, , table: int_full_act_record.0 */
-	{
-	.description = "flow_cntr_ptr",
-	.field_bit_size = 14,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
-	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 & 0xff}
-	},
-	{
-	.description = "age_enable",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "agg_cntr_en",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "rate_cntr_en",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "flow_cntr_en",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
 	.field_opr1 = {
-	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_ACT_BIT_COUNT & 0xff}
-	},
-	{
-	.description = "tcpflags_key",
-	.field_bit_size = 8,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	(BNXT_ULP_ACT_PROP_IDX_SET_VLAN_PCP >> 8) & 0xff,
+	BNXT_ULP_ACT_PROP_IDX_SET_VLAN_PCP & 0xff}
 	},
 	{
-	.description = "tcpflags_mir",
+	.description = "vtag_de",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tcpflags_match",
-	.field_bit_size = 1,
+	.description = "vtag_vid",
+	.field_bit_size = 12,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+	.field_opr1 = {
+	(BNXT_ULP_ACT_PROP_IDX_SET_VLAN_VID >> 8) & 0xff,
+	BNXT_ULP_ACT_PROP_IDX_SET_VLAN_VID & 0xff}
 	},
+	/* act_tid: 7, , table: mirror_tbl.alloc */
 	{
-	.description = "encap_ptr",
-	.field_bit_size = 11,
+	.description = "act_rec_ptr",
+	.field_bit_size = 16,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "dst_ip_ptr",
-	.field_bit_size = 10,
+	.description = "enable",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	1}
 	},
 	{
-	.description = "tcp_dst_port",
-	.field_bit_size = 16,
+	.description = "copy",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "src_ip_ptr",
-	.field_bit_size = 10,
+	.description = "ign_drop",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tcp_src_port",
-	.field_bit_size = 16,
+	.description = "reserved",
+	.field_bit_size = 2,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "meter_id",
-	.field_bit_size = 10,
+	.description = "sp_ptr",
+	.field_bit_size = 11,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
+	/* act_tid: 7, , table: int_flow_counter_tbl.mirror */
 	{
-	.description = "l3_rdir",
-	.field_bit_size = 1,
+	.description = "count",
+	.field_bit_size = 64,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
+	/* act_tid: 7, , table: int_encap_custom_record.mirr_2_vf */
 	{
-	.description = "tl3_rdir",
+	.description = "ecv_valid",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	ULP_WP_SYM_ECV_VALID_YES}
 	},
 	{
-	.description = "l3_ttl_dec",
+	.description = "ecv_custom_en",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	ULP_WP_SYM_ECV_CUSTOM_EN_YES}
 	},
 	{
-	.description = "tl3_ttl_dec",
-	.field_bit_size = 1,
+	.description = "ecv_vtag_type",
+	.field_bit_size = 4,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "decap_func",
-	.field_bit_size = 4,
+	.description = "ecv_l2_en",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "vnic_or_vport",
-	.field_bit_size = 12,
+	.description = "ecv_l3_type",
+	.field_bit_size = 3,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
-	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_RSS_VNIC >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_RSS_VNIC & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "pop_vlan",
-	.field_bit_size = 1,
+	.description = "ecv_l4_type",
+	.field_bit_size = 3,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "meter",
-	.field_bit_size = 1,
+	.description = "ecv_tun_type",
+	.field_bit_size = 3,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "mirror",
-	.field_bit_size = 2,
+	.description = "encap_l2_dmac",
+	.field_bit_size = 48,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+		0x00,
+		0x0a,
+		0xf7,
+		0xaa,
+		0x10,
+		0x01}
 	},
 	{
-	.description = "drop",
-	.field_bit_size = 1,
+	.description = "encap_l2_smac",
+	.field_bit_size = 48,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+		0x00,
+		0x0a,
+		0xf7,
+		0xaa,
+		0x10,
+		0x00}
 	},
 	{
-	.description = "hit",
-	.field_bit_size = 1,
+	.description = "encap_l2_etype",
+	.field_bit_size = 16,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+		0xff,
+		0xff}
 	},
 	{
-	.description = "type",
-	.field_bit_size = 1,
+	.description = "encap_l2_pair_id",
+	.field_bit_size = 16,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_PORT_TABLE,
+	.field_opr1 = {
+		(BNXT_ULP_CF_IDX_MP_PORT_B >> 8) & 0xff,
+		BNXT_ULP_CF_IDX_MP_PORT_B & 0xff,
+		(BNXT_ULP_PORT_TABLE_VF_FUNC_METADATA >> 8) & 0xff,
+		BNXT_ULP_PORT_TABLE_VF_FUNC_METADATA & 0xff}
 	},
-	/* act_tid: 4, , table: int_full_act_record.1 */
+	/* act_tid: 7, , table: int_full_act_record.mirr_2_vf */
 	{
 	.description = "flow_cntr_ptr",
 	.field_bit_size = 14,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
 	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 & 0xff}
+	(BNXT_ULP_RF_IDX_MIRR_FLOW_CNTR_PTR_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MIRR_FLOW_CNTR_PTR_0 & 0xff}
 	},
 	{
 	.description = "age_enable",
@@ -3390,7 +9060,10 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	.description = "encap_ptr",
 	.field_bit_size = 11,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_MIRR_ENCAP_PTR_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MIRR_ENCAP_PTR_0 & 0xff}
 	},
 	{
 	.description = "dst_ip_ptr",
@@ -3456,10 +9129,10 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	.description = "vnic_or_vport",
 	.field_bit_size = 12,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
-	(BNXT_ULP_ACT_PROP_IDX_VNIC >> 8) & 0xff,
-	BNXT_ULP_ACT_PROP_IDX_VNIC & 0xff}
+	(ULP_WP_SYM_LOOPBACK_PORT >> 8) & 0xff,
+	ULP_WP_SYM_LOOPBACK_PORT & 0xff}
 	},
 	{
 	.description = "pop_vlan",
@@ -3497,14 +9170,95 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* act_tid: 6, , table: int_flow_counter_tbl.0 */
+	/* act_tid: 7, , table: mirror_tbl.wr */
+	{
+	.description = "act_rec_ptr",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_MIRR_ACTION_PTR >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MIRR_ACTION_PTR & 0xff}
+	},
+	{
+	.description = "enable",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	1}
+	},
+	{
+	.description = "copy",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ign_drop",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "reserved",
+	.field_bit_size = 2,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "sp_ptr",
+	.field_bit_size = 11,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	/* act_tid: 7, , table: multi_shared_mirror_record.wr_b */
+	{
+	.description = "rid",
+	.field_bit_size = 32,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_RID >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_RID & 0xff}
+	},
+	{
+	.description = "mirror_id",
+	.field_bit_size = 4,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_MIRROR_ID_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MIRROR_ID_0 & 0xff}
+	},
+	/* act_tid: 7, , table: int_flow_counter_tbl.0 */
 	{
 	.description = "count",
 	.field_bit_size = 64,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* act_tid: 6, , table: int_vtag_encap_record.0 */
+	/* act_tid: 7, , table: act_modify_ipv4_src.0 */
+	{
+	.description = "ipv4_addr",
+	.field_bit_size = 32,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+	.field_opr1 = {
+	(BNXT_ULP_ACT_PROP_IDX_SET_IPV4_SRC >> 8) & 0xff,
+	BNXT_ULP_ACT_PROP_IDX_SET_IPV4_SRC & 0xff}
+	},
+	/* act_tid: 7, , table: act_modify_ipv4_dst.0 */
+	{
+	.description = "ipv4_addr",
+	.field_bit_size = 32,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+	.field_opr1 = {
+	(BNXT_ULP_ACT_PROP_IDX_SET_IPV4_DST >> 8) & 0xff,
+	BNXT_ULP_ACT_PROP_IDX_SET_IPV4_DST & 0xff}
+	},
+	/* act_tid: 7, , table: int_encap_mac_record.dummy */
 	{
 	.description = "ecv_valid",
 	.field_bit_size = 1,
@@ -3523,15 +9277,15 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	.description = "ecv_vtag_type",
 	.field_bit_size = 4,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-	ULP_WP_SYM_ECV_VTAG_TYPE_ADD_1_ENCAP_PRI}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "ecv_l2_en",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	ULP_WP_SYM_ECV_L2_EN_YES}
 	},
 	{
 	.description = "ecv_l3_type",
@@ -3555,19 +9309,13 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	.description = "vtag_tpid",
 	.field_bit_size = 16,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
-	.field_opr1 = {
-	(BNXT_ULP_ACT_PROP_IDX_PUSH_VLAN >> 8) & 0xff,
-	BNXT_ULP_ACT_PROP_IDX_PUSH_VLAN & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "vtag_pcp",
 	.field_bit_size = 3,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
-	.field_opr1 = {
-	(BNXT_ULP_ACT_PROP_IDX_SET_VLAN_PCP >> 8) & 0xff,
-	BNXT_ULP_ACT_PROP_IDX_SET_VLAN_PCP & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "vtag_de",
@@ -3579,12 +9327,9 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	.description = "vtag_vid",
 	.field_bit_size = 12,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
-	.field_opr1 = {
-	(BNXT_ULP_ACT_PROP_IDX_SET_VLAN_VID >> 8) & 0xff,
-	BNXT_ULP_ACT_PROP_IDX_SET_VLAN_VID & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* act_tid: 6, , table: int_full_act_record.0 */
+	/* act_tid: 7, , table: int_full_act_record.0 */
 	{
 	.description = "flow_cntr_ptr",
 	.field_bit_size = 14,
@@ -3649,34 +9394,68 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	.description = "encap_ptr",
 	.field_bit_size = 11,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
 	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_ENCAP_PTR_0 >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_ENCAP_PTR_0 & 0xff}
+	(BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR >> 8) & 0xff,
+	BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR & 0xff}
 	},
 	{
 	.description = "dst_ip_ptr",
 	.field_bit_size = 10,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 & 0xff}
 	},
 	{
 	.description = "tcp_dst_port",
 	.field_bit_size = 16,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST & 0xff},
+	.field_src2 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+	.field_opr2 = {
+	(BNXT_ULP_ACT_PROP_IDX_SET_TP_DST >> 8) & 0xff,
+	BNXT_ULP_ACT_PROP_IDX_SET_TP_DST & 0xff},
+	.field_src3 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "src_ip_ptr",
 	.field_bit_size = 10,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 & 0xff}
 	},
 	{
 	.description = "tcp_src_port",
 	.field_bit_size = 16,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC & 0xff},
+	.field_src2 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+	.field_opr2 = {
+	(BNXT_ULP_ACT_PROP_IDX_SET_TP_SRC >> 8) & 0xff,
+	BNXT_ULP_ACT_PROP_IDX_SET_TP_SRC & 0xff},
+	.field_src3 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "meter_id",
@@ -3717,17 +9496,32 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	{
 	.description = "decap_func",
 	.field_bit_size = 4,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+	.field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN & 0xff},
+	.field_src2 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr2 = {
+	ULP_WP_SYM_DECAP_FUNC_THRU_TL2},
+	.field_src3 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr3 = {
+	ULP_WP_SYM_DECAP_FUNC_THRU_L2}
 	},
 	{
 	.description = "vnic_or_vport",
 	.field_bit_size = 12,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
 	.field_opr1 = {
-	(BNXT_ULP_ACT_PROP_IDX_VPORT >> 8) & 0xff,
-	BNXT_ULP_ACT_PROP_IDX_VPORT & 0xff}
+	(BNXT_ULP_RF_IDX_DEST_VPORT >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_DEST_VPORT & 0xff}
 	},
 	{
 	.description = "pop_vlan",
@@ -3745,22 +9539,16 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	.description = "mirror",
 	.field_bit_size = 2,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_MIRROR_ID_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MIRROR_ID_0 & 0xff}
 	},
 	{
 	.description = "drop",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
-	.field_opr1 = {
-	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_ACT_BIT_DROP & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "hit",
@@ -3774,7 +9562,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* act_tid: 6, , table: ext_full_act_record.no_tag */
+	/* act_tid: 7, , table: ext_full_act_record.0 */
 	{
 	.description = "flow_cntr_ptr",
 	.field_bit_size = 14,
@@ -3845,37 +9633,76 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	.description = "encap_ptr",
 	.field_bit_size = 11,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
+	.field_opr1 = {
+	(BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR >> 8) & 0xff,
+	BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR & 0xff}
 	},
 	{
 	.description = "encap_rec_int",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	1}
 	},
 	{
 	.description = "dst_ip_ptr",
 	.field_bit_size = 10,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 & 0xff}
 	},
 	{
 	.description = "tcp_dst_port",
 	.field_bit_size = 16,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST & 0xff},
+	.field_src2 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+	.field_opr2 = {
+	(BNXT_ULP_ACT_PROP_IDX_SET_TP_DST >> 8) & 0xff,
+	BNXT_ULP_ACT_PROP_IDX_SET_TP_DST & 0xff},
+	.field_src3 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "src_ip_ptr",
 	.field_bit_size = 10,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 & 0xff}
 	},
 	{
 	.description = "tcp_src_port",
 	.field_bit_size = 16,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC & 0xff},
+	.field_src2 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+	.field_opr2 = {
+	(BNXT_ULP_ACT_PROP_IDX_SET_TP_SRC >> 8) & 0xff,
+	BNXT_ULP_ACT_PROP_IDX_SET_TP_SRC & 0xff},
+	.field_src3 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "meter_id",
@@ -3916,17 +9743,32 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	{
 	.description = "decap_func",
 	.field_bit_size = 4,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+	.field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN & 0xff},
+	.field_src2 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr2 = {
+	ULP_WP_SYM_DECAP_FUNC_THRU_TL2},
+	.field_src3 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr3 = {
+	ULP_WP_SYM_DECAP_FUNC_THRU_L2}
 	},
 	{
 	.description = "vnic_or_vport",
 	.field_bit_size = 12,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
 	.field_opr1 = {
-	(BNXT_ULP_ACT_PROP_IDX_VPORT >> 8) & 0xff,
-	BNXT_ULP_ACT_PROP_IDX_VPORT & 0xff}
+	(BNXT_ULP_RF_IDX_DEST_VPORT >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_DEST_VPORT & 0xff}
 	},
 	{
 	.description = "pop_vlan",
@@ -3944,22 +9786,16 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	.description = "mirror",
 	.field_bit_size = 2,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_MIRROR_ID_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MIRROR_ID_0 & 0xff}
 	},
 	{
 	.description = "drop",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
-	.field_opr1 = {
-	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_ACT_BIT_DROP & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "ecv_valid",
@@ -4009,35 +9845,174 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	.description = "vtag_tpid",
 	.field_bit_size = 16,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "vtag_pcp",
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "vtag_de",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "vtag_vid",
+	.field_bit_size = 12,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	/* act_tid: 8, , table: mirror_tbl.alloc */
+	{
+	.description = "act_rec_ptr",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "enable",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	1}
+	},
+	{
+	.description = "copy",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ign_drop",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "reserved",
+	.field_bit_size = 2,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "sp_ptr",
+	.field_bit_size = 11,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	/* act_tid: 8, , table: int_flow_counter_tbl.mirror */
+	{
+	.description = "count",
+	.field_bit_size = 64,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	/* act_tid: 8, , table: int_encap_custom_record.mirr_2_vf */
+	{
+	.description = "ecv_valid",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	ULP_WP_SYM_ECV_VALID_YES}
+	},
+	{
+	.description = "ecv_custom_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	ULP_WP_SYM_ECV_CUSTOM_EN_YES}
+	},
+	{
+	.description = "ecv_vtag_type",
+	.field_bit_size = 4,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ecv_l2_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ecv_l3_type",
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ecv_l4_type",
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ecv_tun_type",
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "encap_l2_dmac",
+	.field_bit_size = 48,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+		0x00,
+		0x0a,
+		0xf7,
+		0xaa,
+		0x10,
+		0x01}
 	},
 	{
-	.description = "vtag_pcp",
-	.field_bit_size = 3,
+	.description = "encap_l2_smac",
+	.field_bit_size = 48,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+		0x00,
+		0x0a,
+		0xf7,
+		0xaa,
+		0x10,
+		0x00}
 	},
 	{
-	.description = "vtag_de",
-	.field_bit_size = 1,
+	.description = "encap_l2_etype",
+	.field_bit_size = 16,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+		0xff,
+		0xff}
 	},
 	{
-	.description = "vtag_vid",
-	.field_bit_size = 12,
+	.description = "encap_l2_pair_id",
+	.field_bit_size = 16,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_PORT_TABLE,
+	.field_opr1 = {
+		(BNXT_ULP_CF_IDX_MP_PORT_B >> 8) & 0xff,
+		BNXT_ULP_CF_IDX_MP_PORT_B & 0xff,
+		(BNXT_ULP_PORT_TABLE_VF_FUNC_METADATA >> 8) & 0xff,
+		BNXT_ULP_PORT_TABLE_VF_FUNC_METADATA & 0xff}
 	},
-	/* act_tid: 6, , table: ext_full_act_record.one_tag */
+	/* act_tid: 8, , table: int_full_act_record.mirr_2_vf */
 	{
 	.description = "flow_cntr_ptr",
 	.field_bit_size = 14,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
 	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 & 0xff}
+	(BNXT_ULP_RF_IDX_MIRR_FLOW_CNTR_PTR_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MIRR_FLOW_CNTR_PTR_0 & 0xff}
 	},
 	{
 	.description = "age_enable",
@@ -4073,12 +10048,6 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	(uint64_t)BNXT_ULP_ACT_BIT_COUNT & 0xff}
 	},
 	{
-	.description = "flow_cntr_ext",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
 	.description = "tcpflags_key",
 	.field_bit_size = 8,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
@@ -4100,13 +10069,10 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	.description = "encap_ptr",
 	.field_bit_size = 11,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "encap_rec_int",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_MIRR_ENCAP_PTR_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MIRR_ENCAP_PTR_0 & 0xff}
 	},
 	{
 	.description = "dst_ip_ptr",
@@ -4154,19 +10120,13 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	.description = "l3_ttl_dec",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
-	.field_opr1 = {
-	(BNXT_ULP_CF_IDX_ACT_DEC_TTL >> 8) & 0xff,
-	BNXT_ULP_CF_IDX_ACT_DEC_TTL & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "tl3_ttl_dec",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
-	.field_opr1 = {
-	(BNXT_ULP_CF_IDX_ACT_T_DEC_TTL >> 8) & 0xff,
-	BNXT_ULP_CF_IDX_ACT_T_DEC_TTL & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "decap_func",
@@ -4178,25 +10138,16 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	.description = "vnic_or_vport",
 	.field_bit_size = 12,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
-	(BNXT_ULP_ACT_PROP_IDX_VPORT >> 8) & 0xff,
-	BNXT_ULP_ACT_PROP_IDX_VPORT & 0xff}
+	(ULP_WP_SYM_LOOPBACK_PORT >> 8) & 0xff,
+	ULP_WP_SYM_LOOPBACK_PORT & 0xff}
 	},
 	{
 	.description = "pop_vlan",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
-	.field_opr1 = {
-	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_ACT_BIT_POP_VLAN & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "meter",
@@ -4211,198 +10162,671 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "drop",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
+	.description = "drop",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "hit",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "type",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	/* act_tid: 8, , table: mirror_tbl.wr */
+	{
+	.description = "act_rec_ptr",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_MIRR_ACTION_PTR >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MIRR_ACTION_PTR & 0xff}
+	},
+	{
+	.description = "enable",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	1}
+	},
+	{
+	.description = "copy",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ign_drop",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "reserved",
+	.field_bit_size = 2,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "sp_ptr",
+	.field_bit_size = 11,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	/* act_tid: 8, , table: multi_shared_mirror_record.wr_b */
+	{
+	.description = "rid",
+	.field_bit_size = 32,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_RID >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_RID & 0xff}
+	},
+	{
+	.description = "mirror_id",
+	.field_bit_size = 4,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_MIRROR_ID_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MIRROR_ID_0 & 0xff}
+	},
+	/* act_tid: 8, , table: int_flow_counter_tbl.0 */
+	{
+	.description = "count",
+	.field_bit_size = 64,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	/* act_tid: 8, , table: sp_smac_ipv4.0 */
+	{
+	.description = "smac",
+	.field_bit_size = 48,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+	.field_opr1 = {
+	(BNXT_ULP_ENC_FIELD_ETH_SMAC >> 8) & 0xff,
+	BNXT_ULP_ENC_FIELD_ETH_SMAC & 0xff}
+	},
+	{
+	.description = "ipv4_src_addr",
+	.field_bit_size = 32,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+	.field_opr1 = {
+	(BNXT_ULP_ENC_FIELD_IPV4_SADDR >> 8) & 0xff,
+	BNXT_ULP_ENC_FIELD_IPV4_SADDR & 0xff}
+	},
+	/* act_tid: 8, , table: sp_smac_ipv6.0 */
+	{
+	.description = "smac",
+	.field_bit_size = 48,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+	.field_opr1 = {
+	(BNXT_ULP_ENC_FIELD_ETH_SMAC >> 8) & 0xff,
+	BNXT_ULP_ENC_FIELD_ETH_SMAC & 0xff}
+	},
+	{
+	.description = "ipv6_src_addr",
+	.field_bit_size = 128,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+	.field_opr1 = {
+	(BNXT_ULP_ENC_FIELD_IPV6_SADDR >> 8) & 0xff,
+	BNXT_ULP_ENC_FIELD_IPV6_SADDR & 0xff}
+	},
+	/* act_tid: 8, , table: int_tun_encap_record.0 */
+	{
+	.description = "ecv_valid",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	ULP_WP_SYM_ECV_VALID_YES}
+	},
+	{
+	.description = "ecv_custom_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ecv_vtag_type",
+	.field_bit_size = 4,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+	.field_opr1 = {
+	(BNXT_ULP_ACT_PROP_IDX_ENCAP_VTAG_TYPE >> 8) & 0xff,
+	BNXT_ULP_ACT_PROP_IDX_ENCAP_VTAG_TYPE & 0xff}
+	},
+	{
+	.description = "ecv_l2_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	ULP_WP_SYM_ECV_L2_EN_YES}
+	},
+	{
+	.description = "ecv_l3_type",
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+	.field_opr1 = {
+	(BNXT_ULP_ACT_PROP_IDX_ENCAP_L3_TYPE >> 8) & 0xff,
+	BNXT_ULP_ACT_PROP_IDX_ENCAP_L3_TYPE & 0xff}
+	},
+	{
+	.description = "ecv_l4_type",
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	ULP_WP_SYM_ECV_L4_TYPE_UDP_CSUM}
+	},
+	{
+	.description = "ecv_tun_type",
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	ULP_WP_SYM_ECV_TUN_TYPE_VXLAN}
+	},
+	{
+	.description = "enc_eth_dmac",
+	.field_bit_size = 48,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+	.field_opr1 = {
+	(BNXT_ULP_ENC_FIELD_ETH_DMAC >> 8) & 0xff,
+	BNXT_ULP_ENC_FIELD_ETH_DMAC & 0xff}
+	},
+	{
+	.description = "enc_o_vlan_tag",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_HDR_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN & 0xff},
+	.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+	.field_opr2 = {
+	(BNXT_ULP_ENC_FIELD_O_VLAN_TCI >> 8) & 0xff,
+	BNXT_ULP_ENC_FIELD_O_VLAN_TCI & 0xff},
+	.field_src3 = BNXT_ULP_FIELD_SRC_SKIP
+	},
+	{
+	.description = "enc_o_vlan_type",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_HDR_BIT,
 	.field_opr1 = {
-	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_DROP >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_ACT_BIT_DROP & 0xff}
+	((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN & 0xff},
+	.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+	.field_opr2 = {
+	(BNXT_ULP_ENC_FIELD_O_VLAN_TYPE >> 8) & 0xff,
+	BNXT_ULP_ENC_FIELD_O_VLAN_TYPE & 0xff},
+	.field_src3 = BNXT_ULP_FIELD_SRC_SKIP
 	},
 	{
-	.description = "ecv_valid",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.description = "enc_i_vlan_tag",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_HDR_BIT,
 	.field_opr1 = {
-	1}
+	((uint64_t)BNXT_ULP_HDR_BIT_OI_VLAN >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_OI_VLAN >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_OI_VLAN >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_OI_VLAN >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_OI_VLAN >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_OI_VLAN >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_OI_VLAN >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_HDR_BIT_OI_VLAN & 0xff},
+	.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+	.field_opr2 = {
+	(BNXT_ULP_ENC_FIELD_I_VLAN_TCI >> 8) & 0xff,
+	BNXT_ULP_ENC_FIELD_I_VLAN_TCI & 0xff},
+	.field_src3 = BNXT_ULP_FIELD_SRC_SKIP
 	},
 	{
-	.description = "ecv_custom_en",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.description = "enc_i_vlan_type",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_HDR_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_HDR_BIT_OI_VLAN >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_OI_VLAN >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_OI_VLAN >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_OI_VLAN >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_OI_VLAN >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_OI_VLAN >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_OI_VLAN >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_HDR_BIT_OI_VLAN & 0xff},
+	.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+	.field_opr2 = {
+	(BNXT_ULP_ENC_FIELD_I_VLAN_TYPE >> 8) & 0xff,
+	BNXT_ULP_ENC_FIELD_I_VLAN_TYPE & 0xff},
+	.field_src3 = BNXT_ULP_FIELD_SRC_SKIP
 	},
 	{
-	.description = "ecv_vtag_type",
-	.field_bit_size = 4,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.description = "enc_ipv4_ihl",
+	.field_bit_size = 8,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_HDR_BIT,
 	.field_opr1 = {
-	ULP_WP_SYM_ECV_VTAG_TYPE_ADD_1_ENCAP_PRI}
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 & 0xff},
+	.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+	.field_opr2 = {
+	(BNXT_ULP_ENC_FIELD_IPV4_IHL >> 8) & 0xff,
+	BNXT_ULP_ENC_FIELD_IPV4_IHL & 0xff},
+	.field_src3 = BNXT_ULP_FIELD_SRC_SKIP
 	},
 	{
-	.description = "ecv_l2_en",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.description = "enc_ipv4_tos",
+	.field_bit_size = 8,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_HDR_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 & 0xff},
+	.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+	.field_opr2 = {
+	(BNXT_ULP_ENC_FIELD_IPV4_TOS >> 8) & 0xff,
+	BNXT_ULP_ENC_FIELD_IPV4_TOS & 0xff},
+	.field_src3 = BNXT_ULP_FIELD_SRC_SKIP
 	},
 	{
-	.description = "ecv_l3_type",
-	.field_bit_size = 3,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.description = "enc_ipv4_pkt_id",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_HDR_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 & 0xff},
+	.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+	.field_opr2 = {
+	(BNXT_ULP_ENC_FIELD_IPV4_PKT_ID >> 8) & 0xff,
+	BNXT_ULP_ENC_FIELD_IPV4_PKT_ID & 0xff},
+	.field_src3 = BNXT_ULP_FIELD_SRC_SKIP
 	},
 	{
-	.description = "ecv_l4_type",
-	.field_bit_size = 3,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.description = "enc_ipv4_frag",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_HDR_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 & 0xff},
+	.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+	.field_opr2 = {
+	(BNXT_ULP_ENC_FIELD_IPV4_FRAG >> 8) & 0xff,
+	BNXT_ULP_ENC_FIELD_IPV4_FRAG & 0xff},
+	.field_src3 = BNXT_ULP_FIELD_SRC_SKIP
 	},
 	{
-	.description = "ecv_tun_type",
-	.field_bit_size = 3,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.description = "enc_ipv4_ttl",
+	.field_bit_size = 8,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_HDR_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 & 0xff},
+	.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+	.field_opr2 = {
+	(BNXT_ULP_ENC_FIELD_IPV4_TTL >> 8) & 0xff,
+	BNXT_ULP_ENC_FIELD_IPV4_TTL & 0xff},
+	.field_src3 = BNXT_ULP_FIELD_SRC_SKIP
 	},
 	{
-	.description = "vtag_tpid",
-	.field_bit_size = 16,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+	.description = "enc_ipv4_proto",
+	.field_bit_size = 8,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_HDR_BIT,
 	.field_opr1 = {
-	(BNXT_ULP_ACT_PROP_IDX_PUSH_VLAN >> 8) & 0xff,
-	BNXT_ULP_ACT_PROP_IDX_PUSH_VLAN & 0xff}
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 & 0xff},
+	.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+	.field_opr2 = {
+	(BNXT_ULP_ENC_FIELD_IPV4_PROTO >> 8) & 0xff,
+	BNXT_ULP_ENC_FIELD_IPV4_PROTO & 0xff},
+	.field_src3 = BNXT_ULP_FIELD_SRC_SKIP
 	},
 	{
-	.description = "vtag_pcp",
-	.field_bit_size = 3,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+	.description = "enc_ipv4_daddr",
+	.field_bit_size = 32,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_HDR_BIT,
 	.field_opr1 = {
-	(BNXT_ULP_ACT_PROP_IDX_SET_VLAN_PCP >> 8) & 0xff,
-	BNXT_ULP_ACT_PROP_IDX_SET_VLAN_PCP & 0xff}
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 & 0xff},
+	.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+	.field_opr2 = {
+	(BNXT_ULP_ENC_FIELD_IPV4_DADDR >> 8) & 0xff,
+	BNXT_ULP_ENC_FIELD_IPV4_DADDR & 0xff},
+	.field_src3 = BNXT_ULP_FIELD_SRC_SKIP
 	},
 	{
-	.description = "vtag_de",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.description = "enc_ipv6_vtc",
+	.field_bit_size = 32,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_HDR_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 & 0xff},
+	.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+	.field_opr2 = {
+	(BNXT_ULP_ENC_FIELD_IPV6_VTC_FLOW >> 8) & 0xff,
+	BNXT_ULP_ENC_FIELD_IPV6_VTC_FLOW & 0xff},
+	.field_src3 = BNXT_ULP_FIELD_SRC_SKIP
 	},
 	{
-	.description = "vtag_vid",
-	.field_bit_size = 12,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+	.description = "enc_ipv6_zero",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_HDR_BIT,
 	.field_opr1 = {
-	(BNXT_ULP_ACT_PROP_IDX_SET_VLAN_VID >> 8) & 0xff,
-	BNXT_ULP_ACT_PROP_IDX_SET_VLAN_VID & 0xff}
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 & 0xff},
+	.field_src2 = BNXT_ULP_FIELD_SRC_ZERO,
+	.field_src3 = BNXT_ULP_FIELD_SRC_SKIP
 	},
-	/* act_tid: 7, , table: int_flow_counter_tbl.0 */
 	{
-	.description = "count",
-	.field_bit_size = 64,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.description = "enc_ipv6_proto",
+	.field_bit_size = 8,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_HDR_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 & 0xff},
+	.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+	.field_opr2 = {
+	(BNXT_ULP_ENC_FIELD_IPV6_PROTO >> 8) & 0xff,
+	BNXT_ULP_ENC_FIELD_IPV6_PROTO & 0xff},
+	.field_src3 = BNXT_ULP_FIELD_SRC_SKIP
 	},
-	/* act_tid: 7, , table: act_modify_ipv4_src.0 */
 	{
-	.description = "ipv4_addr",
-	.field_bit_size = 32,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+	.description = "enc_ipv6_ttl",
+	.field_bit_size = 8,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_HDR_BIT,
 	.field_opr1 = {
-	(BNXT_ULP_ACT_PROP_IDX_SET_IPV4_SRC >> 8) & 0xff,
-	BNXT_ULP_ACT_PROP_IDX_SET_IPV4_SRC & 0xff}
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 & 0xff},
+	.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+	.field_opr2 = {
+	(BNXT_ULP_ENC_FIELD_IPV6_TTL >> 8) & 0xff,
+	BNXT_ULP_ENC_FIELD_IPV6_TTL & 0xff},
+	.field_src3 = BNXT_ULP_FIELD_SRC_SKIP
 	},
-	/* act_tid: 7, , table: act_modify_ipv4_dst.0 */
 	{
-	.description = "ipv4_addr",
-	.field_bit_size = 32,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+	.description = "enc_ipv6_daddr",
+	.field_bit_size = 128,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_HDR_BIT,
 	.field_opr1 = {
-	(BNXT_ULP_ACT_PROP_IDX_SET_IPV4_DST >> 8) & 0xff,
-	BNXT_ULP_ACT_PROP_IDX_SET_IPV4_DST & 0xff}
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 & 0xff},
+	.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+	.field_opr2 = {
+	(BNXT_ULP_ENC_FIELD_IPV6_DADDR >> 8) & 0xff,
+	BNXT_ULP_ENC_FIELD_IPV6_DADDR & 0xff},
+	.field_src3 = BNXT_ULP_FIELD_SRC_SKIP
 	},
-	/* act_tid: 7, , table: int_encap_vlan_record.dummy */
 	{
-	.description = "ecv_valid",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.description = "enc_udp_sport",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_HDR_BIT,
 	.field_opr1 = {
-	1}
+	((uint64_t)BNXT_ULP_HDR_BIT_O_UDP >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_UDP >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_UDP >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_UDP >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_UDP >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_UDP >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_UDP >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_HDR_BIT_O_UDP & 0xff},
+	.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+	.field_opr2 = {
+	(BNXT_ULP_ENC_FIELD_UDP_SPORT >> 8) & 0xff,
+	BNXT_ULP_ENC_FIELD_UDP_SPORT & 0xff},
+	.field_src3 = BNXT_ULP_FIELD_SRC_SKIP
 	},
 	{
-	.description = "ecv_custom_en",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.description = "enc_udp_dport",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_HDR_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_HDR_BIT_O_UDP >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_UDP >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_UDP >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_UDP >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_UDP >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_UDP >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_O_UDP >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_HDR_BIT_O_UDP & 0xff},
+	.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+	.field_opr2 = {
+	(BNXT_ULP_ENC_FIELD_UDP_DPORT >> 8) & 0xff,
+	BNXT_ULP_ENC_FIELD_UDP_DPORT & 0xff},
+	.field_src3 = BNXT_ULP_FIELD_SRC_SKIP
 	},
 	{
-	.description = "ecv_vtag_type",
-	.field_bit_size = 4,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.description = "enc_vxlan_flags",
+	.field_bit_size = 8,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_HDR_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN & 0xff},
+	.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+	.field_opr2 = {
+	(BNXT_ULP_ENC_FIELD_VXLAN_FLAGS >> 8) & 0xff,
+	BNXT_ULP_ENC_FIELD_VXLAN_FLAGS & 0xff},
+	.field_src3 = BNXT_ULP_FIELD_SRC_SKIP
 	},
 	{
-	.description = "ecv_l2_en",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.description = "enc_vxlan_rsvd0",
+	.field_bit_size = 24,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_HDR_BIT,
 	.field_opr1 = {
-	ULP_WP_SYM_ECV_L2_EN_YES}
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN & 0xff},
+	.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+	.field_opr2 = {
+	(BNXT_ULP_ENC_FIELD_VXLAN_RSVD0 >> 8) & 0xff,
+	BNXT_ULP_ENC_FIELD_VXLAN_RSVD0 & 0xff},
+	.field_src3 = BNXT_ULP_FIELD_SRC_SKIP
 	},
 	{
-	.description = "ecv_l3_type",
-	.field_bit_size = 3,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.description = "enc_vxlan_vni",
+	.field_bit_size = 24,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_HDR_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN & 0xff},
+	.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+	.field_opr2 = {
+	(BNXT_ULP_ENC_FIELD_VXLAN_VNI >> 8) & 0xff,
+	BNXT_ULP_ENC_FIELD_VXLAN_VNI & 0xff},
+	.field_src3 = BNXT_ULP_FIELD_SRC_SKIP
 	},
 	{
-	.description = "ecv_l4_type",
-	.field_bit_size = 3,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.description = "enc_vxlan_rsvd1",
+	.field_bit_size = 8,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_HDR_BIT,
+	.field_opr1 = {
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN & 0xff},
+	.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+	.field_opr2 = {
+	(BNXT_ULP_ENC_FIELD_VXLAN_RSVD1 >> 8) & 0xff,
+	BNXT_ULP_ENC_FIELD_VXLAN_RSVD1 & 0xff},
+	.field_src3 = BNXT_ULP_FIELD_SRC_SKIP
 	},
+	/* act_tid: 8, , table: vxlan_encap_rec_cache.wr */
 	{
-	.description = "ecv_tun_type",
-	.field_bit_size = 3,
+	.description = "rid",
+	.field_bit_size = 32,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_RID >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_RID & 0xff}
 	},
 	{
-	.description = "vtag_tpid",
+	.description = "enc_rec_ptr",
 	.field_bit_size = 16,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "vtag_pcp",
-	.field_bit_size = 3,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_ENCAP_PTR_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_ENCAP_PTR_0 & 0xff}
 	},
+	/* act_tid: 8, , table: vxlan_encap_ipv6_rec_cache.wr */
 	{
-	.description = "vtag_de",
-	.field_bit_size = 1,
+	.description = "rid",
+	.field_bit_size = 32,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_RID >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_RID & 0xff}
 	},
 	{
-	.description = "vtag_vid",
-	.field_bit_size = 12,
+	.description = "enc_rec_ptr",
+	.field_bit_size = 16,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_ENCAP_PTR_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_ENCAP_PTR_0 & 0xff}
 	},
-	/* act_tid: 7, , table: int_full_act_record.0 */
+	/* act_tid: 8, , table: int_full_act_record.0 */
 	{
 	.description = "flow_cntr_ptr",
 	.field_bit_size = 14,
@@ -4467,68 +10891,34 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	.description = "encap_ptr",
 	.field_bit_size = 11,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
 	.field_opr1 = {
-	(BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR >> 8) & 0xff,
-	BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR & 0xff}
+	(BNXT_ULP_RF_IDX_ENCAP_PTR_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_ENCAP_PTR_0 & 0xff}
 	},
 	{
 	.description = "dst_ip_ptr",
 	.field_bit_size = 10,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
-	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "tcp_dst_port",
 	.field_bit_size = 16,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
-	.field_opr1 = {
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST & 0xff},
-	.field_src2 = BNXT_ULP_FIELD_SRC_ACT_PROP,
-	.field_opr2 = {
-	(BNXT_ULP_ACT_PROP_IDX_SET_TP_DST >> 8) & 0xff,
-	BNXT_ULP_ACT_PROP_IDX_SET_TP_DST & 0xff},
-	.field_src3 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "src_ip_ptr",
 	.field_bit_size = 10,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
-	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "tcp_src_port",
 	.field_bit_size = 16,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
-	.field_opr1 = {
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC & 0xff},
-	.field_src2 = BNXT_ULP_FIELD_SRC_ACT_PROP,
-	.field_opr2 = {
-	(BNXT_ULP_ACT_PROP_IDX_SET_TP_SRC >> 8) & 0xff,
-	BNXT_ULP_ACT_PROP_IDX_SET_TP_SRC & 0xff},
-	.field_src3 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "meter_id",
@@ -4552,49 +10942,28 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	.description = "l3_ttl_dec",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
-	.field_opr1 = {
-	(BNXT_ULP_CF_IDX_ACT_DEC_TTL >> 8) & 0xff,
-	BNXT_ULP_CF_IDX_ACT_DEC_TTL & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "tl3_ttl_dec",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
-	.field_opr1 = {
-	(BNXT_ULP_CF_IDX_ACT_T_DEC_TTL >> 8) & 0xff,
-	BNXT_ULP_CF_IDX_ACT_T_DEC_TTL & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "decap_func",
 	.field_bit_size = 4,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-	.field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,
-	.field_opr1 = {
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN & 0xff},
-	.field_src2 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr2 = {
-	ULP_WP_SYM_DECAP_FUNC_THRU_TL2},
-	.field_src3 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr3 = {
-	ULP_WP_SYM_DECAP_FUNC_THRU_L2}
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "vnic_or_vport",
 	.field_bit_size = 12,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
 	.field_opr1 = {
-	(BNXT_ULP_ACT_PROP_IDX_VPORT >> 8) & 0xff,
-	BNXT_ULP_ACT_PROP_IDX_VPORT & 0xff}
+	(BNXT_ULP_RF_IDX_DEST_VPORT >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_DEST_VPORT & 0xff}
 	},
 	{
 	.description = "pop_vlan",
@@ -4612,372 +10981,204 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	.description = "mirror",
 	.field_bit_size = 2,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "drop",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "hit",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "type",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	/* act_tid: 7, , table: ext_full_act_record.0 */
-	{
-	.description = "flow_cntr_ptr",
-	.field_bit_size = 14,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
 	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 & 0xff}
-	},
-	{
-	.description = "age_enable",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "agg_cntr_en",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "rate_cntr_en",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "flow_cntr_en",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
-	.field_opr1 = {
-	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_ACT_BIT_COUNT & 0xff}
-	},
-	{
-	.description = "flow_cntr_ext",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "tcpflags_key",
-	.field_bit_size = 8,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "tcpflags_mir",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	(BNXT_ULP_RF_IDX_MIRROR_ID_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MIRROR_ID_0 & 0xff}
 	},
 	{
-	.description = "tcpflags_match",
+	.description = "drop",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "encap_ptr",
-	.field_bit_size = 11,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
-	.field_opr1 = {
-	(BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR >> 8) & 0xff,
-	BNXT_ULP_GLB_RF_IDX_ENCAP_MAC_PTR & 0xff}
-	},
-	{
-	.description = "encap_rec_int",
+	.description = "hit",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-	1}
-	},
-	{
-	.description = "dst_ip_ptr",
-	.field_bit_size = 10,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
-	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_MODIFY_IPV4_DST_PTR_0 & 0xff}
-	},
-	{
-	.description = "tcp_dst_port",
-	.field_bit_size = 16,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
-	.field_opr1 = {
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_DST & 0xff},
-	.field_src2 = BNXT_ULP_FIELD_SRC_ACT_PROP,
-	.field_opr2 = {
-	(BNXT_ULP_ACT_PROP_IDX_SET_TP_DST >> 8) & 0xff,
-	BNXT_ULP_ACT_PROP_IDX_SET_TP_DST & 0xff},
-	.field_src3 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "src_ip_ptr",
-	.field_bit_size = 10,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
-	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_MODIFY_IPV4_SRC_PTR_0 & 0xff}
-	},
-	{
-	.description = "tcp_src_port",
-	.field_bit_size = 16,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
-	.field_opr1 = {
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_ACT_BIT_SET_TP_SRC & 0xff},
-	.field_src2 = BNXT_ULP_FIELD_SRC_ACT_PROP,
-	.field_opr2 = {
-	(BNXT_ULP_ACT_PROP_IDX_SET_TP_SRC >> 8) & 0xff,
-	BNXT_ULP_ACT_PROP_IDX_SET_TP_SRC & 0xff},
-	.field_src3 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "meter_id",
-	.field_bit_size = 10,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "l3_rdir",
+	.description = "type",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
+	/* act_tid: 8, , table: ext_full_act_record_vxlan.0 */
 	{
-	.description = "tl3_rdir",
-	.field_bit_size = 1,
+	.description = "flow_cntr_ptr",
+	.field_bit_size = 14,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 & 0xff}
 	},
 	{
-	.description = "l3_ttl_dec",
+	.description = "age_enable",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
-	.field_opr1 = {
-	(BNXT_ULP_CF_IDX_ACT_DEC_TTL >> 8) & 0xff,
-	BNXT_ULP_CF_IDX_ACT_DEC_TTL & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tl3_ttl_dec",
+	.description = "agg_cntr_en",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
-	.field_opr1 = {
-	(BNXT_ULP_CF_IDX_ACT_T_DEC_TTL >> 8) & 0xff,
-	BNXT_ULP_CF_IDX_ACT_T_DEC_TTL & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "decap_func",
-	.field_bit_size = 4,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-	.field_src1 = BNXT_ULP_FIELD_SRC_HDR_BIT,
-	.field_opr1 = {
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN & 0xff},
-	.field_src2 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr2 = {
-	ULP_WP_SYM_DECAP_FUNC_THRU_TL2},
-	.field_src3 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr3 = {
-	ULP_WP_SYM_DECAP_FUNC_THRU_L2}
+	.description = "rate_cntr_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "vnic_or_vport",
-	.field_bit_size = 12,
+	.description = "flow_cntr_en",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
 	.field_opr1 = {
-	(BNXT_ULP_ACT_PROP_IDX_VPORT >> 8) & 0xff,
-	BNXT_ULP_ACT_PROP_IDX_VPORT & 0xff}
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 56) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 48) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 40) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 32) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 24) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 16) & 0xff,
+	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 8) & 0xff,
+	(uint64_t)BNXT_ULP_ACT_BIT_COUNT & 0xff}
 	},
 	{
-	.description = "pop_vlan",
+	.description = "flow_cntr_ext",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "meter",
-	.field_bit_size = 1,
+	.description = "tcpflags_key",
+	.field_bit_size = 8,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "mirror",
-	.field_bit_size = 2,
+	.description = "tcpflags_mir",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "drop",
+	.description = "tcpflags_match",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "ecv_valid",
-	.field_bit_size = 1,
+	.description = "encap_ptr",
+	.field_bit_size = 11,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-	ULP_WP_SYM_ECV_VALID_YES}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "ecv_custom_en",
+	.description = "encap_rec_int",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "ecv_vtag_type",
-	.field_bit_size = 4,
+	.description = "dst_ip_ptr",
+	.field_bit_size = 10,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "ecv_l2_en",
-	.field_bit_size = 1,
+	.description = "tcp_dst_port",
+	.field_bit_size = 16,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "ecv_l3_type",
-	.field_bit_size = 3,
+	.description = "src_ip_ptr",
+	.field_bit_size = 10,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "ecv_l4_type",
-	.field_bit_size = 3,
+	.description = "tcp_src_port",
+	.field_bit_size = 16,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "ecv_tun_type",
-	.field_bit_size = 3,
+	.description = "meter_id",
+	.field_bit_size = 10,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "vtag_tpid",
-	.field_bit_size = 16,
+	.description = "l3_rdir",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "vtag_pcp",
-	.field_bit_size = 3,
+	.description = "tl3_rdir",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "vtag_de",
+	.description = "l3_ttl_dec",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "vtag_vid",
-	.field_bit_size = 12,
+	.description = "tl3_ttl_dec",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* act_tid: 8, , table: int_flow_counter_tbl.0 */
 	{
-	.description = "count",
-	.field_bit_size = 64,
+	.description = "decap_func",
+	.field_bit_size = 4,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* act_tid: 8, , table: sp_smac_ipv4.0 */
 	{
-	.description = "smac",
-	.field_bit_size = 48,
+	.description = "vnic_or_vport",
+	.field_bit_size = 12,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
 	.field_opr1 = {
-	(BNXT_ULP_ENC_FIELD_ETH_SMAC >> 8) & 0xff,
-	BNXT_ULP_ENC_FIELD_ETH_SMAC & 0xff}
+	(BNXT_ULP_RF_IDX_DEST_VPORT >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_DEST_VPORT & 0xff}
 	},
 	{
-	.description = "ipv4_src_addr",
-	.field_bit_size = 32,
+	.description = "pop_vlan",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
-	.field_opr1 = {
-	(BNXT_ULP_ENC_FIELD_IPV4_SADDR >> 8) & 0xff,
-	BNXT_ULP_ENC_FIELD_IPV4_SADDR & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* act_tid: 8, , table: sp_smac_ipv6.0 */
 	{
-	.description = "smac",
-	.field_bit_size = 48,
+	.description = "meter",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
-	.field_opr1 = {
-	(BNXT_ULP_ENC_FIELD_ETH_SMAC >> 8) & 0xff,
-	BNXT_ULP_ENC_FIELD_ETH_SMAC & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "ipv6_src_addr",
-	.field_bit_size = 128,
+	.description = "mirror",
+	.field_bit_size = 2,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
 	.field_opr1 = {
-	(BNXT_ULP_ENC_FIELD_IPV6_SADDR >> 8) & 0xff,
-	BNXT_ULP_ENC_FIELD_IPV6_SADDR & 0xff}
+	(BNXT_ULP_RF_IDX_MIRROR_ID_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MIRROR_ID_0 & 0xff}
+	},
+	{
+	.description = "drop",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* act_tid: 8, , table: int_tun_encap_record.0 */
 	{
 	.description = "ecv_valid",
 	.field_bit_size = 1,
@@ -5480,190 +11681,154 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	BNXT_ULP_ENC_FIELD_VXLAN_RSVD1 & 0xff},
 	.field_src3 = BNXT_ULP_FIELD_SRC_SKIP
 	},
-	/* act_tid: 8, , table: int_full_act_record.0 */
-	{
-	.description = "flow_cntr_ptr",
-	.field_bit_size = 14,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
-	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 & 0xff}
-	},
-	{
-	.description = "age_enable",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "agg_cntr_en",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
+	/* act_tid: 9, , table: mirror_tbl.alloc */
 	{
-	.description = "rate_cntr_en",
-	.field_bit_size = 1,
+	.description = "act_rec_ptr",
+	.field_bit_size = 16,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "flow_cntr_en",
+	.description = "enable",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_BIT,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
-	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_ACT_BIT_COUNT >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_ACT_BIT_COUNT & 0xff}
-	},
-	{
-	.description = "tcpflags_key",
-	.field_bit_size = 8,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	1}
 	},
 	{
-	.description = "tcpflags_mir",
+	.description = "copy",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tcpflags_match",
+	.description = "ign_drop",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "encap_ptr",
-	.field_bit_size = 11,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
-	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_ENCAP_PTR_0 >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_ENCAP_PTR_0 & 0xff}
-	},
-	{
-	.description = "dst_ip_ptr",
-	.field_bit_size = 10,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "tcp_dst_port",
-	.field_bit_size = 16,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "src_ip_ptr",
-	.field_bit_size = 10,
+	.description = "reserved",
+	.field_bit_size = 2,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tcp_src_port",
-	.field_bit_size = 16,
+	.description = "sp_ptr",
+	.field_bit_size = 11,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
+	/* act_tid: 9, , table: int_flow_counter_tbl.mirror */
 	{
-	.description = "meter_id",
-	.field_bit_size = 10,
+	.description = "count",
+	.field_bit_size = 64,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
+	/* act_tid: 9, , table: int_encap_custom_record.mirr_2_vf */
 	{
-	.description = "l3_rdir",
+	.description = "ecv_valid",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	ULP_WP_SYM_ECV_VALID_YES}
 	},
 	{
-	.description = "tl3_rdir",
+	.description = "ecv_custom_en",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	ULP_WP_SYM_ECV_CUSTOM_EN_YES}
 	},
 	{
-	.description = "l3_ttl_dec",
-	.field_bit_size = 1,
+	.description = "ecv_vtag_type",
+	.field_bit_size = 4,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tl3_ttl_dec",
+	.description = "ecv_l2_en",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "decap_func",
-	.field_bit_size = 4,
+	.description = "ecv_l3_type",
+	.field_bit_size = 3,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "vnic_or_vport",
-	.field_bit_size = 12,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
-	.field_opr1 = {
-	(BNXT_ULP_ACT_PROP_IDX_VPORT >> 8) & 0xff,
-	BNXT_ULP_ACT_PROP_IDX_VPORT & 0xff}
-	},
-	{
-	.description = "pop_vlan",
-	.field_bit_size = 1,
+	.description = "ecv_l4_type",
+	.field_bit_size = 3,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "meter",
-	.field_bit_size = 1,
+	.description = "ecv_tun_type",
+	.field_bit_size = 3,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "mirror",
-	.field_bit_size = 2,
+	.description = "encap_l2_dmac",
+	.field_bit_size = 48,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+		0x00,
+		0x0a,
+		0xf7,
+		0xaa,
+		0x10,
+		0x01}
 	},
 	{
-	.description = "drop",
-	.field_bit_size = 1,
+	.description = "encap_l2_smac",
+	.field_bit_size = 48,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+		0x00,
+		0x0a,
+		0xf7,
+		0xaa,
+		0x10,
+		0x00}
 	},
 	{
-	.description = "hit",
-	.field_bit_size = 1,
+	.description = "encap_l2_etype",
+	.field_bit_size = 16,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+		0xff,
+		0xff}
 	},
 	{
-	.description = "type",
-	.field_bit_size = 1,
+	.description = "encap_l2_pair_id",
+	.field_bit_size = 16,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_PORT_TABLE,
+	.field_opr1 = {
+		(BNXT_ULP_CF_IDX_MP_PORT_B >> 8) & 0xff,
+		BNXT_ULP_CF_IDX_MP_PORT_B & 0xff,
+		(BNXT_ULP_PORT_TABLE_VF_FUNC_METADATA >> 8) & 0xff,
+		BNXT_ULP_PORT_TABLE_VF_FUNC_METADATA & 0xff}
 	},
-	/* act_tid: 8, , table: ext_full_act_record_vxlan.0 */
+	/* act_tid: 9, , table: int_full_act_record.mirr_2_vf */
 	{
 	.description = "flow_cntr_ptr",
 	.field_bit_size = 14,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
 	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_FLOW_CNTR_PTR_0 & 0xff}
+	(BNXT_ULP_RF_IDX_MIRR_FLOW_CNTR_PTR_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MIRR_FLOW_CNTR_PTR_0 & 0xff}
 	},
 	{
 	.description = "age_enable",
@@ -5699,12 +11864,6 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	(uint64_t)BNXT_ULP_ACT_BIT_COUNT & 0xff}
 	},
 	{
-	.description = "flow_cntr_ext",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
 	.description = "tcpflags_key",
 	.field_bit_size = 8,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
@@ -5726,13 +11885,10 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	.description = "encap_ptr",
 	.field_bit_size = 11,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "encap_rec_int",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_MIRR_ENCAP_PTR_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MIRR_ENCAP_PTR_0 & 0xff}
 	},
 	{
 	.description = "dst_ip_ptr",
@@ -5798,543 +11954,205 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	.description = "vnic_or_vport",
 	.field_bit_size = 12,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
-	.field_opr1 = {
-	(BNXT_ULP_ACT_PROP_IDX_VPORT >> 8) & 0xff,
-	BNXT_ULP_ACT_PROP_IDX_VPORT & 0xff}
-	},
-	{
-	.description = "pop_vlan",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "meter",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "mirror",
-	.field_bit_size = 2,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "drop",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "ecv_valid",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
-	ULP_WP_SYM_ECV_VALID_YES}
+	(ULP_WP_SYM_LOOPBACK_PORT >> 8) & 0xff,
+	ULP_WP_SYM_LOOPBACK_PORT & 0xff}
 	},
 	{
-	.description = "ecv_custom_en",
+	.description = "pop_vlan",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	{
-	.description = "ecv_vtag_type",
-	.field_bit_size = 4,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
-	.field_opr1 = {
-	(BNXT_ULP_ACT_PROP_IDX_ENCAP_VTAG_TYPE >> 8) & 0xff,
-	BNXT_ULP_ACT_PROP_IDX_ENCAP_VTAG_TYPE & 0xff}
-	},
-	{
-	.description = "ecv_l2_en",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-	ULP_WP_SYM_ECV_L2_EN_YES}
-	},
-	{
-	.description = "ecv_l3_type",
-	.field_bit_size = 3,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
-	.field_opr1 = {
-	(BNXT_ULP_ACT_PROP_IDX_ENCAP_L3_TYPE >> 8) & 0xff,
-	BNXT_ULP_ACT_PROP_IDX_ENCAP_L3_TYPE & 0xff}
-	},
-	{
-	.description = "ecv_l4_type",
-	.field_bit_size = 3,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-	ULP_WP_SYM_ECV_L4_TYPE_UDP_CSUM}
-	},
-	{
-	.description = "ecv_tun_type",
-	.field_bit_size = 3,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-	ULP_WP_SYM_ECV_TUN_TYPE_VXLAN}
-	},
-	{
-	.description = "enc_eth_dmac",
-	.field_bit_size = 48,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
-	.field_opr1 = {
-	(BNXT_ULP_ENC_FIELD_ETH_DMAC >> 8) & 0xff,
-	BNXT_ULP_ENC_FIELD_ETH_DMAC & 0xff}
-	},
-	{
-	.description = "enc_o_vlan_tag",
-	.field_bit_size = 16,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_HDR_BIT,
-	.field_opr1 = {
-	((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN & 0xff},
-	.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
-	.field_opr2 = {
-	(BNXT_ULP_ENC_FIELD_O_VLAN_TCI >> 8) & 0xff,
-	BNXT_ULP_ENC_FIELD_O_VLAN_TCI & 0xff},
-	.field_src3 = BNXT_ULP_FIELD_SRC_SKIP
-	},
-	{
-	.description = "enc_o_vlan_type",
-	.field_bit_size = 16,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_HDR_BIT,
-	.field_opr1 = {
-	((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_HDR_BIT_OO_VLAN & 0xff},
-	.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
-	.field_opr2 = {
-	(BNXT_ULP_ENC_FIELD_O_VLAN_TYPE >> 8) & 0xff,
-	BNXT_ULP_ENC_FIELD_O_VLAN_TYPE & 0xff},
-	.field_src3 = BNXT_ULP_FIELD_SRC_SKIP
-	},
-	{
-	.description = "enc_i_vlan_tag",
-	.field_bit_size = 16,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_HDR_BIT,
-	.field_opr1 = {
-	((uint64_t)BNXT_ULP_HDR_BIT_OI_VLAN >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_OI_VLAN >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_OI_VLAN >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_OI_VLAN >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_OI_VLAN >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_OI_VLAN >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_OI_VLAN >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_HDR_BIT_OI_VLAN & 0xff},
-	.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
-	.field_opr2 = {
-	(BNXT_ULP_ENC_FIELD_I_VLAN_TCI >> 8) & 0xff,
-	BNXT_ULP_ENC_FIELD_I_VLAN_TCI & 0xff},
-	.field_src3 = BNXT_ULP_FIELD_SRC_SKIP
-	},
-	{
-	.description = "enc_i_vlan_type",
-	.field_bit_size = 16,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_HDR_BIT,
-	.field_opr1 = {
-	((uint64_t)BNXT_ULP_HDR_BIT_OI_VLAN >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_OI_VLAN >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_OI_VLAN >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_OI_VLAN >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_OI_VLAN >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_OI_VLAN >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_OI_VLAN >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_HDR_BIT_OI_VLAN & 0xff},
-	.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
-	.field_opr2 = {
-	(BNXT_ULP_ENC_FIELD_I_VLAN_TYPE >> 8) & 0xff,
-	BNXT_ULP_ENC_FIELD_I_VLAN_TYPE & 0xff},
-	.field_src3 = BNXT_ULP_FIELD_SRC_SKIP
-	},
-	{
-	.description = "enc_ipv4_ihl",
-	.field_bit_size = 8,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_HDR_BIT,
-	.field_opr1 = {
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 & 0xff},
-	.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
-	.field_opr2 = {
-	(BNXT_ULP_ENC_FIELD_IPV4_IHL >> 8) & 0xff,
-	BNXT_ULP_ENC_FIELD_IPV4_IHL & 0xff},
-	.field_src3 = BNXT_ULP_FIELD_SRC_SKIP
+	{
+	.description = "meter",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "enc_ipv4_tos",
-	.field_bit_size = 8,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_HDR_BIT,
-	.field_opr1 = {
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 & 0xff},
-	.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
-	.field_opr2 = {
-	(BNXT_ULP_ENC_FIELD_IPV4_TOS >> 8) & 0xff,
-	BNXT_ULP_ENC_FIELD_IPV4_TOS & 0xff},
-	.field_src3 = BNXT_ULP_FIELD_SRC_SKIP
+	.description = "mirror",
+	.field_bit_size = 2,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "enc_ipv4_pkt_id",
-	.field_bit_size = 16,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_HDR_BIT,
-	.field_opr1 = {
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 & 0xff},
-	.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
-	.field_opr2 = {
-	(BNXT_ULP_ENC_FIELD_IPV4_PKT_ID >> 8) & 0xff,
-	BNXT_ULP_ENC_FIELD_IPV4_PKT_ID & 0xff},
-	.field_src3 = BNXT_ULP_FIELD_SRC_SKIP
+	.description = "drop",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "enc_ipv4_frag",
+	.description = "hit",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "type",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	/* act_tid: 9, , table: mirror_tbl.wr */
+	{
+	.description = "act_rec_ptr",
 	.field_bit_size = 16,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_HDR_BIT,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
 	.field_opr1 = {
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 & 0xff},
-	.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
-	.field_opr2 = {
-	(BNXT_ULP_ENC_FIELD_IPV4_FRAG >> 8) & 0xff,
-	BNXT_ULP_ENC_FIELD_IPV4_FRAG & 0xff},
-	.field_src3 = BNXT_ULP_FIELD_SRC_SKIP
+	(BNXT_ULP_RF_IDX_MIRR_ACTION_PTR >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MIRR_ACTION_PTR & 0xff}
 	},
 	{
-	.description = "enc_ipv4_ttl",
-	.field_bit_size = 8,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_HDR_BIT,
+	.description = "enable",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 & 0xff},
-	.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
-	.field_opr2 = {
-	(BNXT_ULP_ENC_FIELD_IPV4_TTL >> 8) & 0xff,
-	BNXT_ULP_ENC_FIELD_IPV4_TTL & 0xff},
-	.field_src3 = BNXT_ULP_FIELD_SRC_SKIP
+	1}
 	},
 	{
-	.description = "enc_ipv4_proto",
-	.field_bit_size = 8,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_HDR_BIT,
-	.field_opr1 = {
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 & 0xff},
-	.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
-	.field_opr2 = {
-	(BNXT_ULP_ENC_FIELD_IPV4_PROTO >> 8) & 0xff,
-	BNXT_ULP_ENC_FIELD_IPV4_PROTO & 0xff},
-	.field_src3 = BNXT_ULP_FIELD_SRC_SKIP
+	.description = "copy",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "enc_ipv4_daddr",
-	.field_bit_size = 32,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_HDR_BIT,
-	.field_opr1 = {
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_HDR_BIT_O_IPV4 & 0xff},
-	.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
-	.field_opr2 = {
-	(BNXT_ULP_ENC_FIELD_IPV4_DADDR >> 8) & 0xff,
-	BNXT_ULP_ENC_FIELD_IPV4_DADDR & 0xff},
-	.field_src3 = BNXT_ULP_FIELD_SRC_SKIP
+	.description = "ign_drop",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "enc_ipv6_vtc",
-	.field_bit_size = 32,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_HDR_BIT,
-	.field_opr1 = {
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 & 0xff},
-	.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
-	.field_opr2 = {
-	(BNXT_ULP_ENC_FIELD_IPV6_VTC_FLOW >> 8) & 0xff,
-	BNXT_ULP_ENC_FIELD_IPV6_VTC_FLOW & 0xff},
-	.field_src3 = BNXT_ULP_FIELD_SRC_SKIP
+	.description = "reserved",
+	.field_bit_size = 2,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "enc_ipv6_zero",
-	.field_bit_size = 16,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_HDR_BIT,
-	.field_opr1 = {
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 & 0xff},
-	.field_src2 = BNXT_ULP_FIELD_SRC_ZERO,
-	.field_src3 = BNXT_ULP_FIELD_SRC_SKIP
+	.description = "sp_ptr",
+	.field_bit_size = 11,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
+	/* act_tid: 9, , table: multi_shared_mirror_record.wr_b */
 	{
-	.description = "enc_ipv6_proto",
-	.field_bit_size = 8,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_HDR_BIT,
+	.description = "rid",
+	.field_bit_size = 32,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
 	.field_opr1 = {
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 & 0xff},
-	.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
-	.field_opr2 = {
-	(BNXT_ULP_ENC_FIELD_IPV6_PROTO >> 8) & 0xff,
-	BNXT_ULP_ENC_FIELD_IPV6_PROTO & 0xff},
-	.field_src3 = BNXT_ULP_FIELD_SRC_SKIP
+	(BNXT_ULP_RF_IDX_RID >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_RID & 0xff}
 	},
 	{
-	.description = "enc_ipv6_ttl",
-	.field_bit_size = 8,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_HDR_BIT,
+	.description = "mirror_id",
+	.field_bit_size = 4,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
 	.field_opr1 = {
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 & 0xff},
-	.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
-	.field_opr2 = {
-	(BNXT_ULP_ENC_FIELD_IPV6_TTL >> 8) & 0xff,
-	BNXT_ULP_ENC_FIELD_IPV6_TTL & 0xff},
-	.field_src3 = BNXT_ULP_FIELD_SRC_SKIP
+	(BNXT_ULP_RF_IDX_MIRROR_ID_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MIRROR_ID_0 & 0xff}
 	},
+	/* act_tid: 9, , table: int_flow_counter_tbl.0 */
 	{
-	.description = "enc_ipv6_daddr",
-	.field_bit_size = 128,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_HDR_BIT,
-	.field_opr1 = {
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_HDR_BIT_O_IPV6 & 0xff},
-	.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
-	.field_opr2 = {
-	(BNXT_ULP_ENC_FIELD_IPV6_DADDR >> 8) & 0xff,
-	BNXT_ULP_ENC_FIELD_IPV6_DADDR & 0xff},
-	.field_src3 = BNXT_ULP_FIELD_SRC_SKIP
+	.description = "count",
+	.field_bit_size = 64,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
+	/* act_tid: 9, , table: int_encap_custom_record.vf_2_vf */
 	{
-	.description = "enc_udp_sport",
-	.field_bit_size = 16,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_HDR_BIT,
+	.description = "ecv_valid",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
-	((uint64_t)BNXT_ULP_HDR_BIT_O_UDP >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_UDP >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_UDP >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_UDP >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_UDP >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_UDP >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_UDP >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_HDR_BIT_O_UDP & 0xff},
-	.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
-	.field_opr2 = {
-	(BNXT_ULP_ENC_FIELD_UDP_SPORT >> 8) & 0xff,
-	BNXT_ULP_ENC_FIELD_UDP_SPORT & 0xff},
-	.field_src3 = BNXT_ULP_FIELD_SRC_SKIP
+	ULP_WP_SYM_ECV_VALID_YES}
 	},
 	{
-	.description = "enc_udp_dport",
-	.field_bit_size = 16,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_HDR_BIT,
+	.description = "ecv_custom_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
-	((uint64_t)BNXT_ULP_HDR_BIT_O_UDP >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_UDP >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_UDP >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_UDP >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_UDP >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_UDP >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_O_UDP >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_HDR_BIT_O_UDP & 0xff},
-	.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
-	.field_opr2 = {
-	(BNXT_ULP_ENC_FIELD_UDP_DPORT >> 8) & 0xff,
-	BNXT_ULP_ENC_FIELD_UDP_DPORT & 0xff},
-	.field_src3 = BNXT_ULP_FIELD_SRC_SKIP
+	ULP_WP_SYM_ECV_CUSTOM_EN_YES}
 	},
 	{
-	.description = "enc_vxlan_flags",
-	.field_bit_size = 8,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_HDR_BIT,
-	.field_opr1 = {
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN & 0xff},
-	.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
-	.field_opr2 = {
-	(BNXT_ULP_ENC_FIELD_VXLAN_FLAGS >> 8) & 0xff,
-	BNXT_ULP_ENC_FIELD_VXLAN_FLAGS & 0xff},
-	.field_src3 = BNXT_ULP_FIELD_SRC_SKIP
+	.description = "ecv_vtag_type",
+	.field_bit_size = 4,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "enc_vxlan_rsvd0",
-	.field_bit_size = 24,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_HDR_BIT,
+	.description = "ecv_l2_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ecv_l3_type",
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ecv_l4_type",
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "ecv_tun_type",
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "encap_l2_dmac",
+	.field_bit_size = 48,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN & 0xff},
-	.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
-	.field_opr2 = {
-	(BNXT_ULP_ENC_FIELD_VXLAN_RSVD0 >> 8) & 0xff,
-	BNXT_ULP_ENC_FIELD_VXLAN_RSVD0 & 0xff},
-	.field_src3 = BNXT_ULP_FIELD_SRC_SKIP
+		0x00,
+		0x0a,
+		0xf7,
+		0xaa,
+		0x10,
+		0x01}
 	},
 	{
-	.description = "enc_vxlan_vni",
-	.field_bit_size = 24,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_HDR_BIT,
+	.description = "encap_l2_smac",
+	.field_bit_size = 48,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN & 0xff},
-	.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
-	.field_opr2 = {
-	(BNXT_ULP_ENC_FIELD_VXLAN_VNI >> 8) & 0xff,
-	BNXT_ULP_ENC_FIELD_VXLAN_VNI & 0xff},
-	.field_src3 = BNXT_ULP_FIELD_SRC_SKIP
+		0x00,
+		0x0a,
+		0xf7,
+		0xaa,
+		0x10,
+		0x00}
 	},
 	{
-	.description = "enc_vxlan_rsvd1",
-	.field_bit_size = 8,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1_THEN_SRC2_ELSE_SRC3,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ENC_HDR_BIT,
+	.description = "encap_l2_etype",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 56) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 48) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 40) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 32) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 24) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 16) & 0xff,
-	((uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN >> 8) & 0xff,
-	(uint64_t)BNXT_ULP_HDR_BIT_T_VXLAN & 0xff},
-	.field_src2 = BNXT_ULP_FIELD_SRC_ENC_FIELD,
-	.field_opr2 = {
-	(BNXT_ULP_ENC_FIELD_VXLAN_RSVD1 >> 8) & 0xff,
-	BNXT_ULP_ENC_FIELD_VXLAN_RSVD1 & 0xff},
-	.field_src3 = BNXT_ULP_FIELD_SRC_SKIP
+		0xff,
+		0xff}
 	},
-	/* act_tid: 9, , table: int_flow_counter_tbl.0 */
 	{
-	.description = "count",
-	.field_bit_size = 64,
+	.description = "encap_l2_pair_id",
+	.field_bit_size = 16,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_DEST_METADATA >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_DEST_METADATA & 0xff}
 	},
 	/* act_tid: 9, , table: int_full_act_record.0 */
 	{
@@ -6401,7 +12219,10 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	.description = "encap_ptr",
 	.field_bit_size = 11,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_ENCAP_PTR_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_ENCAP_PTR_0 & 0xff}
 	},
 	{
 	.description = "dst_ip_ptr",
@@ -6467,10 +12288,10 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	.description = "vnic_or_vport",
 	.field_bit_size = 12,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ACT_PROP,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
-	(BNXT_ULP_ACT_PROP_IDX_VPORT >> 8) & 0xff,
-	BNXT_ULP_ACT_PROP_IDX_VPORT & 0xff}
+	(ULP_WP_SYM_LOOPBACK_PORT >> 8) & 0xff,
+	ULP_WP_SYM_LOOPBACK_PORT & 0xff}
 	},
 	{
 	.description = "pop_vlan",
@@ -6488,7 +12309,10 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_act_result_field_list[] = {
 	.description = "mirror",
 	.field_bit_size = 2,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_MIRROR_ID_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MIRROR_ID_0 & 0xff}
 	},
 	{
 	.description = "drop",
@@ -6515,7 +12339,140 @@ struct bnxt_ulp_mapper_ident_info ulp_wh_plus_act_ident_list[] = {
 	{
 	.description = "mirror_id",
 	.regfile_idx = BNXT_ULP_RF_IDX_MIRROR_ID_0,
-	.ident_bit_size = 2,
+	.ident_bit_size = 4,
+	.ident_bit_pos = 32
+	},
+	/* act_tid: 1, , table: multi_shared_mirror_record.rd_a */
+	{
+	.description = "mirror_id",
+	.regfile_idx = BNXT_ULP_RF_IDX_MIRROR_ID_0,
+	.ident_bit_size = 4,
+	.ident_bit_pos = 32
+	},
+	/* act_tid: 1, , table: multi_shared_mirror_record.rd_b */
+	{
+	.description = "mirror_id",
+	.regfile_idx = BNXT_ULP_RF_IDX_MIRROR_ID_0,
+	.ident_bit_size = 4,
+	.ident_bit_pos = 32
+	},
+	/* act_tid: 3, , table: multi_shared_mirror_record.rd_a */
+	{
+	.description = "mirror_id",
+	.regfile_idx = BNXT_ULP_RF_IDX_MIRROR_ID_0,
+	.ident_bit_size = 4,
+	.ident_bit_pos = 32
+	},
+	/* act_tid: 3, , table: multi_shared_mirror_record.rd_b */
+	{
+	.description = "mirror_id",
+	.regfile_idx = BNXT_ULP_RF_IDX_MIRROR_ID_0,
+	.ident_bit_size = 4,
+	.ident_bit_pos = 32
+	},
+	/* act_tid: 6, , table: shared_mirror_record.rd */
+	{
+	.description = "mirror_id",
+	.regfile_idx = BNXT_ULP_RF_IDX_MIRROR_ID_0,
+	.ident_bit_size = 4,
+	.ident_bit_pos = 32
+	},
+	/* act_tid: 6, , table: multi_shared_mirror_record.rd_a */
+	{
+	.description = "mirror_id",
+	.regfile_idx = BNXT_ULP_RF_IDX_MIRROR_ID_0,
+	.ident_bit_size = 4,
+	.ident_bit_pos = 32
+	},
+	/* act_tid: 6, , table: multi_shared_mirror_record.rd_b */
+	{
+	.description = "mirror_id",
+	.regfile_idx = BNXT_ULP_RF_IDX_MIRROR_ID_0,
+	.ident_bit_size = 4,
+	.ident_bit_pos = 32
+	},
+	/* act_tid: 7, , table: shared_mirror_record.rd */
+	{
+	.description = "mirror_id",
+	.regfile_idx = BNXT_ULP_RF_IDX_MIRROR_ID_0,
+	.ident_bit_size = 4,
+	.ident_bit_pos = 32
+	},
+	/* act_tid: 7, , table: multi_shared_mirror_record.rd_a */
+	{
+	.description = "mirror_id",
+	.regfile_idx = BNXT_ULP_RF_IDX_MIRROR_ID_0,
+	.ident_bit_size = 4,
+	.ident_bit_pos = 32
+	},
+	/* act_tid: 7, , table: multi_shared_mirror_record.rd_b */
+	{
+	.description = "mirror_id",
+	.regfile_idx = BNXT_ULP_RF_IDX_MIRROR_ID_0,
+	.ident_bit_size = 4,
+	.ident_bit_pos = 32
+	},
+	/* act_tid: 8, , table: shared_mirror_record.rd */
+	{
+	.description = "mirror_id",
+	.regfile_idx = BNXT_ULP_RF_IDX_MIRROR_ID_0,
+	.ident_bit_size = 4,
+	.ident_bit_pos = 32
+	},
+	/* act_tid: 8, , table: multi_shared_mirror_record.rd_a */
+	{
+	.description = "mirror_id",
+	.regfile_idx = BNXT_ULP_RF_IDX_MIRROR_ID_0,
+	.ident_bit_size = 4,
+	.ident_bit_pos = 32
+	},
+	/* act_tid: 8, , table: multi_shared_mirror_record.rd_b */
+	{
+	.description = "mirror_id",
+	.regfile_idx = BNXT_ULP_RF_IDX_MIRROR_ID_0,
+	.ident_bit_size = 4,
+	.ident_bit_pos = 32
+	},
+	/* act_tid: 8, , table: port_table.sp_rec_rd */
+	{
+	.description = "sp_rec_ptr",
+	.regfile_idx = BNXT_ULP_RF_IDX_MAIN_SP_PTR,
+	.ident_bit_size = 16,
+	.ident_bit_pos = 163
+	},
+	/* act_tid: 8, , table: vxlan_encap_rec_cache.rd */
+	{
+	.description = "enc_rec_ptr",
+	.regfile_idx = BNXT_ULP_RF_IDX_ENCAP_PTR_0,
+	.ident_bit_size = 16,
+	.ident_bit_pos = 32
+	},
+	/* act_tid: 8, , table: vxlan_encap_ipv6_rec_cache.rd */
+	{
+	.description = "enc_rec_ptr",
+	.regfile_idx = BNXT_ULP_RF_IDX_ENCAP_PTR_0,
+	.ident_bit_size = 16,
+	.ident_bit_pos = 32
+	},
+	/* act_tid: 9, , table: shared_mirror_record.rd */
+	{
+	.description = "mirror_id",
+	.regfile_idx = BNXT_ULP_RF_IDX_MIRROR_ID_0,
+	.ident_bit_size = 4,
+	.ident_bit_pos = 32
+	},
+	/* act_tid: 9, , table: multi_shared_mirror_record.rd_a */
+	{
+	.description = "mirror_id",
+	.regfile_idx = BNXT_ULP_RF_IDX_MIRROR_ID_0,
+	.ident_bit_size = 4,
+	.ident_bit_pos = 32
+	},
+	/* act_tid: 9, , table: multi_shared_mirror_record.rd_b */
+	{
+	.description = "mirror_id",
+	.regfile_idx = BNXT_ULP_RF_IDX_MIRROR_ID_0,
+	.ident_bit_size = 4,
 	.ident_bit_pos = 32
 	}
 };
diff --git a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_wh_plus_class.c b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_wh_plus_class.c
index 9dd9821419..30309d1e82 100644
--- a/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_wh_plus_class.c
+++ b/drivers/net/bnxt/tf_ulp/generic_templates/ulp_template_db_wh_plus_class.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2014-2023 Broadcom
+ * Copyright(c) 2014-2024 Broadcom
  * All rights reserved.
  */
 
@@ -53,7 +53,7 @@ struct bnxt_ulp_mapper_tmpl_info ulp_wh_plus_class_tmpl_list[] = {
 	/* class_tid: 5, egress */
 	[5] = {
 	.device_name = BNXT_ULP_DEVICE_ID_WH_PLUS,
-	.num_tbls = 19,
+	.num_tbls = 24,
 	.start_tbl_idx = 70,
 	.reject_info = {
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_FALSE,
@@ -182,8 +182,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
 	.key_start_idx = 26,
-	.blob_key_bit_size = 14,
-	.key_bit_size = 14,
+	.blob_key_bit_size = 15,
+	.key_bit_size = 15,
 	.key_num_fields = 3,
 	.ident_start_idx = 3,
 	.ident_nums = 3
@@ -312,8 +312,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
 	.key_start_idx = 158,
-	.blob_key_bit_size = 14,
-	.key_bit_size = 14,
+	.blob_key_bit_size = 15,
+	.key_bit_size = 15,
 	.key_num_fields = 3,
 	.result_start_idx = 68,
 	.result_bit_size = 122,
@@ -634,8 +634,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
 	.key_start_idx = 267,
-	.blob_key_bit_size = 14,
-	.key_bit_size = 14,
+	.blob_key_bit_size = 15,
+	.key_bit_size = 15,
 	.key_num_fields = 3,
 	.ident_start_idx = 12,
 	.ident_nums = 3
@@ -694,8 +694,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
 	.key_start_idx = 313,
-	.blob_key_bit_size = 14,
-	.key_bit_size = 14,
+	.blob_key_bit_size = 15,
+	.key_bit_size = 15,
 	.key_num_fields = 3,
 	.result_start_idx = 177,
 	.result_bit_size = 122,
@@ -743,10 +743,10 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 	.result_bit_size = 64,
 	.result_num_fields = 9
 	},
-	{ /* class_tid: 3, , table: l2_cntxt_tcam_cache.rd */
+	{ /* class_tid: 3, , table: port_table.rd */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
 	.resource_sub_type =
-		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM,
+		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PORT_TABLE,
 	.direction = TF_DIR_TX,
 	.execute_info = {
 		.cond_true_goto  = 5,
@@ -860,8 +860,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
 	.key_start_idx = 358,
-	.blob_key_bit_size = 14,
-	.key_bit_size = 14,
+	.blob_key_bit_size = 15,
+	.key_bit_size = 15,
 	.key_num_fields = 3,
 	.ident_start_idx = 18,
 	.ident_nums = 3
@@ -963,8 +963,8 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
 	.key_start_idx = 447,
-	.blob_key_bit_size = 14,
-	.key_bit_size = 14,
+	.blob_key_bit_size = 15,
+	.key_bit_size = 15,
 	.key_num_fields = 3,
 	.result_start_idx = 251,
 	.result_bit_size = 122,
@@ -1474,31 +1474,11 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 	.result_bit_size = 32,
 	.result_num_fields = 1
 	},
-	{ /* class_tid: 5, , table: int_full_act_record.loopback */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.resource_sub_type =
-		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_VFR_CFA_ACTION,
-	.direction = TF_DIR_TX,
-	.execute_info = {
-		.cond_true_goto  = 1,
-		.cond_false_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 47,
-		.cond_nums = 0 },
-	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_WR_GLB_REGFILE,
-	.tbl_operand = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
-	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-	.result_start_idx = 427,
-	.result_bit_size = 128,
-	.result_num_fields = 26,
-	.encap_num_fields = 0
-	},
-	{ /* class_tid: 5, , table: l2_cntxt_tcam_cache.vf_rd_egr */
+	{ /* class_tid: 5, , table: profile_tcam_cache.vfr_glb_act_rec_rd */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
+	.resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM,
 	.resource_sub_type =
-		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM,
+		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM,
 	.direction = TF_DIR_TX,
 	.execute_info = {
 		.cond_true_goto  = 1,
@@ -1510,27 +1490,29 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
 	.key_start_idx = 537,
-	.blob_key_bit_size = 8,
-	.key_bit_size = 8,
-	.key_num_fields = 1,
+	.blob_key_bit_size = 15,
+	.key_bit_size = 15,
+	.key_num_fields = 3,
 	.ident_start_idx = 25,
 	.ident_nums = 0
 	},
-	{ /* class_tid: 5, , table: control.vf_0 */
+	{ /* class_tid: 5, , table: control.prof_tcam_cache.vfr_glb_act_rec_rd.0 */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
 	.direction = TF_DIR_TX,
 	.execute_info = {
 		.cond_true_goto  = 1,
-		.cond_false_goto = 3,
+		.cond_false_goto = 11,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
 		.cond_start_idx = 47,
 		.cond_nums = 1 },
 	.fdb_opcode = BNXT_ULP_FDB_OPC_ALLOC_RID_REGFILE,
 	.fdb_operand = BNXT_ULP_RF_IDX_RID
 	},
-	{ /* class_tid: 5, , table: l2_cntxt_tcam.vf_egr */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
+	{ /* class_tid: 5, , table: int_encap_custom_record.vfr_egr0 */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_ACT_ENCAP_64B,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
 	.direction = TF_DIR_TX,
 	.execute_info = {
 		.cond_true_goto  = 1,
@@ -1538,26 +1520,22 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
 		.cond_start_idx = 48,
 		.cond_nums = 0 },
-	.tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0,
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_ENCAP_PTR_0,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
 	.fdb_operand = BNXT_ULP_RF_IDX_RID,
-	.pri_opcode  = BNXT_ULP_PRI_OPC_CONST,
-	.pri_operand = 0,
-	.key_start_idx = 538,
-	.blob_key_bit_size = 167,
-	.key_bit_size = 167,
-	.key_num_fields = 13,
-	.result_start_idx = 453,
-	.result_bit_size = 64,
-	.result_num_fields = 13,
-	.ident_start_idx = 25,
-	.ident_nums = 1
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.record_size = 64,
+	.result_start_idx = 427,
+	.result_bit_size = 0,
+	.result_num_fields = 0,
+	.encap_num_fields = 11
 	},
-	{ /* class_tid: 5, , table: l2_cntxt_tcam_cache.vf_egr_wr */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
+	{ /* class_tid: 5, , table: int_full_act_record.loopback */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
 	.resource_sub_type =
-		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM,
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_VFR_CFA_ACTION,
 	.direction = TF_DIR_TX,
 	.execute_info = {
 		.cond_true_goto  = 1,
@@ -1565,16 +1543,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
 		.cond_start_idx = 48,
 		.cond_nums = 0 },
-	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_WRITE,
-	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.key_start_idx = 551,
-	.blob_key_bit_size = 8,
-	.key_bit_size = 8,
-	.key_num_fields = 1,
-	.result_start_idx = 466,
-	.result_bit_size = 62,
-	.result_num_fields = 4
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_WR_GLB_REGFILE,
+	.tbl_operand = BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_NOP,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.result_start_idx = 438,
+	.result_bit_size = 128,
+	.result_num_fields = 26
 	},
 	{ /* class_tid: 5, , table: parif_def_lkup_arec_ptr.vf_egr */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_IF_TABLE,
@@ -1588,8 +1563,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_IF_TBL_OPC_WR_CONST,
 	.tbl_operand = ULP_WP_SYM_LOOPBACK_PARIF,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 470,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.result_start_idx = 464,
 	.result_bit_size = 32,
 	.result_num_fields = 1
 	},
@@ -1605,8 +1581,9 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_IF_TBL_OPC_WR_CONST,
 	.tbl_operand = ULP_WP_SYM_LOOPBACK_PARIF,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 471,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.result_start_idx = 465,
 	.result_bit_size = 32,
 	.result_num_fields = 1
 	},
@@ -1622,33 +1599,13 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_IF_TBL_OPC_WR_CONST,
 	.tbl_operand = ULP_WP_SYM_LOOPBACK_PARIF,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.result_start_idx = 472,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.result_start_idx = 466,
 	.result_bit_size = 32,
 	.result_num_fields = 1
 	},
-	{ /* class_tid: 5, , table: int_full_act_record.vf_ing */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
-	.resource_sub_type =
-		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
-	.direction = TF_DIR_RX,
-	.execute_info = {
-		.cond_true_goto  = 1,
-		.cond_false_goto = 1,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 48,
-		.cond_nums = 0 },
-	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_AND_SET_VFR_FLAG,
-	.result_start_idx = 473,
-	.result_bit_size = 128,
-	.result_num_fields = 26,
-	.encap_num_fields = 0
-	},
-	{ /* class_tid: 5, , table: l2_cntxt_tcam_bypass.vf_ing */
+	{ /* class_tid: 5, , table: l2_cntxt_tcam.vf_vfr_ing */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
 	.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
 	.direction = TF_DIR_RX,
@@ -1665,58 +1622,81 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 	.pri_operand = 0,
 	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
 	.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO,
-	.key_start_idx = 552,
+	.key_start_idx = 540,
 	.blob_key_bit_size = 167,
 	.key_bit_size = 167,
 	.key_num_fields = 13,
-	.result_start_idx = 499,
+	.result_start_idx = 467,
 	.result_bit_size = 64,
 	.result_num_fields = 13,
-	.ident_start_idx = 26,
-	.ident_nums = 0
+	.ident_start_idx = 25,
+	.ident_nums = 1
 	},
-	{ /* class_tid: 5, , table: l2_cntxt_tcam_cache.vfr_rd_egr0 */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
-	.resource_sub_type =
-		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM,
-	.direction = TF_DIR_TX,
+	{ /* class_tid: 5, , table: profile_tcam.vf_vfr_ing */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
+	.resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM,
+	.direction = TF_DIR_RX,
 	.execute_info = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
 		.cond_start_idx = 48,
 		.cond_nums = 0 },
-	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
-	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.key_start_idx = 565,
-	.blob_key_bit_size = 8,
-	.key_bit_size = 8,
-	.key_num_fields = 1,
+	.tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_PROFILE_TCAM_INDEX_0,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.pri_opcode  = BNXT_ULP_PRI_OPC_CONST,
+	.pri_operand = 1,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO,
+	.key_start_idx = 553,
+	.blob_key_bit_size = 81,
+	.key_bit_size = 81,
+	.key_num_fields = 43,
+	.result_start_idx = 480,
+	.result_bit_size = 38,
+	.result_num_fields = 17,
 	.ident_start_idx = 26,
 	.ident_nums = 0
 	},
-	{ /* class_tid: 5, , table: control.vfr_0 */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
-	.direction = TF_DIR_TX,
+	{ /* class_tid: 5, , table: profile_tcam.any_vf_ing */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
+	.resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM,
+	.direction = TF_DIR_RX,
 	.execute_info = {
 		.cond_true_goto  = 1,
-		.cond_false_goto = 3,
-		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
 		.cond_start_idx = 48,
-		.cond_nums = 1 },
-	.fdb_opcode = BNXT_ULP_FDB_OPC_ALLOC_RID_REGFILE,
-	.fdb_operand = BNXT_ULP_RF_IDX_RID
+		.cond_nums = 0 },
+	.tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_PROFILE_TCAM_INDEX_0,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.pri_opcode  = BNXT_ULP_PRI_OPC_CONST,
+	.pri_operand = 1,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO,
+	.key_start_idx = 596,
+	.blob_key_bit_size = 81,
+	.key_bit_size = 81,
+	.key_num_fields = 43,
+	.result_start_idx = 497,
+	.result_bit_size = 38,
+	.result_num_fields = 17,
+	.ident_start_idx = 26,
+	.ident_nums = 0
 	},
-	{ /* class_tid: 5, , table: l2_cntxt_tcam_bypass.vfr_egr0 */
+	{ /* class_tid: 5, , table: l2_cntxt_tcam.vfr_vf_ing */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
-	.direction = TF_DIR_TX,
+	.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
+	.direction = TF_DIR_RX,
 	.execute_info = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 49,
+		.cond_start_idx = 48,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0,
@@ -1724,65 +1704,79 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 	.fdb_operand = BNXT_ULP_RF_IDX_RID,
 	.pri_opcode  = BNXT_ULP_PRI_OPC_CONST,
 	.pri_operand = 0,
-	.key_start_idx = 566,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO,
+	.key_start_idx = 639,
 	.blob_key_bit_size = 167,
 	.key_bit_size = 167,
 	.key_num_fields = 13,
-	.result_start_idx = 512,
+	.result_start_idx = 514,
 	.result_bit_size = 64,
 	.result_num_fields = 13,
 	.ident_start_idx = 26,
-	.ident_nums = 0
+	.ident_nums = 1
 	},
-	{ /* class_tid: 5, , table: l2_cntxt_tcam_cache.vfr_wr_egr0 */
+	{ /* class_tid: 5, , table: profile_tcam_cache.vfr_glb_act_rec_wr */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
+	.resource_type = TF_TCAM_TBL_TYPE_PROF_TCAM,
 	.resource_sub_type =
-		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_L2_CNTXT_TCAM,
+		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PROFILE_TCAM,
 	.direction = TF_DIR_TX,
 	.execute_info = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 49,
+		.cond_start_idx = 48,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_WRITE,
 	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.key_start_idx = 579,
-	.blob_key_bit_size = 8,
-	.key_bit_size = 8,
-	.key_num_fields = 1,
-	.result_start_idx = 525,
-	.result_bit_size = 62,
-	.result_num_fields = 4
+	.key_start_idx = 652,
+	.blob_key_bit_size = 15,
+	.key_bit_size = 15,
+	.key_num_fields = 3,
+	.result_start_idx = 527,
+	.result_bit_size = 122,
+	.result_num_fields = 5
 	},
-	{ /* class_tid: 5, , table: int_vtag_encap_record.vfr_egr0 */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type = TF_TBL_TYPE_ACT_ENCAP_8B,
+	{ /* class_tid: 5, , table: port_table.vfr_rd */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
 	.resource_sub_type =
-		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
+		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PORT_TABLE,
 	.direction = TF_DIR_TX,
 	.execute_info = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
-		.cond_start_idx = 49,
+		.cond_start_idx = 48,
 		.cond_nums = 0 },
-	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_ENCAP_PTR_0,
+	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_READ,
+	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-	.record_size = 8,
-	.result_start_idx = 529,
-	.result_bit_size = 0,
-	.result_num_fields = 0,
-	.encap_num_fields = 11
+	.key_start_idx = 655,
+	.blob_key_bit_size = 8,
+	.key_bit_size = 8,
+	.key_num_fields = 1,
+	.ident_start_idx = 27,
+	.ident_nums = 1
 	},
-	{ /* class_tid: 5, , table: int_full_act_record.vfr_egr0 */
+	{ /* class_tid: 5, , table: control.vfr_port_0 */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_CTRL_TABLE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 4,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_AND,
+		.cond_start_idx = 48,
+		.cond_nums = 1 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_ALLOC_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID
+	},
+	{ /* class_tid: 5, , table: sp_smac_ipv4.0 */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
+	.resource_type = TF_TBL_TYPE_ACT_SP_SMAC_IPV4,
 	.resource_sub_type =
-		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_VFR_CFA_ACTION,
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
 	.direction = TF_DIR_TX,
 	.execute_info = {
 		.cond_true_goto  = 1,
@@ -1791,19 +1785,20 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 		.cond_start_idx = 49,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
+	.tbl_operand = BNXT_ULP_RF_IDX_RF_4,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-	.result_start_idx = 540,
-	.result_bit_size = 128,
-	.result_num_fields = 26
+	.record_size = 16,
+	.result_start_idx = 532,
+	.result_bit_size = 0,
+	.result_num_fields = 0,
+	.encap_num_fields = 2
 	},
-	{ /* class_tid: 5, , table: int_full_act_record.vfr_ing0 */
+	{ /* class_tid: 5, , table: sp_smac_ipv6.0 */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
-	.resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
+	.resource_type = TF_TBL_TYPE_ACT_SP_SMAC_IPV6,
 	.resource_sub_type =
 		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
-	.direction = TF_DIR_RX,
+	.direction = TF_DIR_TX,
 	.execute_info = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
@@ -1811,17 +1806,18 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 		.cond_start_idx = 49,
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
+	.tbl_operand = BNXT_ULP_RF_IDX_RF_6,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-	.result_start_idx = 566,
-	.result_bit_size = 128,
-	.result_num_fields = 26
+	.record_size = 24,
+	.result_start_idx = 534,
+	.result_bit_size = 0,
+	.result_num_fields = 0,
+	.encap_num_fields = 2
 	},
-	{ /* class_tid: 5, , table: l2_cntxt_tcam_bypass.vfr_dtagged_ing0 */
+	{ /* class_tid: 5, , table: l2_cntxt_tcam.vf_egr */
 	.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
-	.direction = TF_DIR_RX,
+	.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW,
+	.direction = TF_DIR_TX,
 	.execute_info = {
 		.cond_true_goto  = 1,
 		.cond_false_goto = 1,
@@ -1830,47 +1826,170 @@ struct bnxt_ulp_mapper_tbl_info ulp_wh_plus_class_tbl_list[] = {
 		.cond_nums = 0 },
 	.tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
 	.tbl_operand = BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0,
-	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
 	.pri_opcode  = BNXT_ULP_PRI_OPC_CONST,
 	.pri_operand = 0,
-	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-	.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO,
-	.key_start_idx = 580,
+	.key_start_idx = 656,
 	.blob_key_bit_size = 167,
 	.key_bit_size = 167,
 	.key_num_fields = 13,
-	.result_start_idx = 592,
+	.result_start_idx = 536,
 	.result_bit_size = 64,
 	.result_num_fields = 13,
-	.ident_start_idx = 26,
-	.ident_nums = 0
+	.ident_start_idx = 28,
+	.ident_nums = 1
 	},
-	{ /* class_tid: 5, , table: l2_cntxt_tcam_bypass.vfr_stagged_ing0 */
-	.resource_func = BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE,
-	.resource_type = TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH,
+	{ /* class_tid: 5, , table: int_full_act_record.vf_vfr_ing */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
 	.direction = TF_DIR_RX,
 	.execute_info = {
-		.cond_true_goto  = 0,
-		.cond_false_goto = 0,
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
 		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
 		.cond_start_idx = 49,
 		.cond_nums = 0 },
-	.tbl_opcode = BNXT_ULP_TCAM_TBL_OPC_ALLOC_WR_REGFILE,
-	.tbl_operand = BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0,
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_AND_SET_VFR_FLAG,
+	.result_start_idx = 549,
+	.result_bit_size = 128,
+	.result_num_fields = 26
+	},
+	{ /* class_tid: 5, , table: em.vfr */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
+	.resource_type = TF_MEM_INTERNAL,
+	.direction = TF_DIR_RX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 49,
+		.cond_nums = 0 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION,
+	.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES,
+	.key_start_idx = 669,
+	.blob_key_bit_size = 104,
+	.key_bit_size = 104,
+	.key_num_fields = 8,
+	.result_start_idx = 575,
+	.result_bit_size = 64,
+	.result_num_fields = 9
+	},
+	{ /* class_tid: 5, , table: int_encap_custom_record.vfr_vf_egr0 */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_ACT_ENCAP_64B,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 49,
+		.cond_nums = 0 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_ENCAP_PTR_0,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.record_size = 64,
+	.result_start_idx = 584,
+	.result_bit_size = 0,
+	.result_num_fields = 0,
+	.encap_num_fields = 11
+	},
+	{ /* class_tid: 5, , table: int_full_act_record.vfr_egr0 */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_VFR_CFA_ACTION,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 49,
+		.cond_nums = 0 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
 	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
-	.pri_opcode  = BNXT_ULP_PRI_OPC_CONST,
-	.pri_operand = 0,
 	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
-	.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_NO,
-	.key_start_idx = 593,
-	.blob_key_bit_size = 167,
-	.key_bit_size = 167,
-	.key_num_fields = 13,
-	.result_start_idx = 605,
+	.result_start_idx = 595,
+	.result_bit_size = 128,
+	.result_num_fields = 26
+	},
+	{ /* class_tid: 5, , table: int_full_act_record.vfr_ing0 */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE,
+	.resource_type = TF_TBL_TYPE_FULL_ACT_RECORD,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_INDEX_TABLE_NORMAL,
+	.direction = TF_DIR_RX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 49,
+		.cond_nums = 0 },
+	.tbl_opcode = BNXT_ULP_INDEX_TBL_OPC_ALLOC_WR_REGFILE,
+	.tbl_operand = BNXT_ULP_RF_IDX_MAIN_ACTION_PTR,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_NOP,
+	.result_start_idx = 621,
+	.result_bit_size = 128,
+	.result_num_fields = 26
+	},
+	{ /* class_tid: 5, , table: em.any_vf */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_EM_TABLE,
+	.resource_type = TF_MEM_INTERNAL,
+	.direction = TF_DIR_RX,
+	.execute_info = {
+		.cond_true_goto  = 1,
+		.cond_false_goto = 1,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 49,
+		.cond_nums = 0 },
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_RID_REGFILE,
+	.fdb_operand = BNXT_ULP_RF_IDX_RID,
+	.mark_db_opcode = BNXT_ULP_MARK_DB_OPC_PUSH_IF_MARK_ACTION,
+	.critical_resource = BNXT_ULP_CRITICAL_RESOURCE_YES,
+	.key_start_idx = 677,
+	.blob_key_bit_size = 208,
+	.key_bit_size = 208,
+	.key_num_fields = 12,
+	.result_start_idx = 647,
 	.result_bit_size = 64,
-	.result_num_fields = 13,
-	.ident_start_idx = 26,
-	.ident_nums = 0
+	.result_num_fields = 9
+	},
+	{ /* class_tid: 5, , table: port_table.vfr_wr */
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_GENERIC_TABLE,
+	.resource_sub_type =
+		BNXT_ULP_RESOURCE_SUB_TYPE_GENERIC_TABLE_PORT_TABLE,
+	.direction = TF_DIR_TX,
+	.execute_info = {
+		.cond_true_goto  = 0,
+		.cond_false_goto = 0,
+		.cond_list_opcode = BNXT_ULP_COND_LIST_OPC_TRUE,
+		.cond_start_idx = 49,
+		.cond_nums = 0 },
+	.tbl_opcode = BNXT_ULP_GENERIC_TBL_OPC_WRITE,
+	.gen_tbl_lkup_type = BNXT_ULP_GENERIC_TBL_LKUP_TYPE_INDEX,
+	.fdb_opcode = BNXT_ULP_FDB_OPC_PUSH_FID,
+	.key_start_idx = 689,
+	.blob_key_bit_size = 8,
+	.key_bit_size = 8,
+	.key_num_fields = 1,
+	.result_start_idx = 656,
+	.result_bit_size = 179,
+	.result_num_fields = 8
 	}
 };
 
@@ -2013,7 +2132,7 @@ struct bnxt_ulp_mapper_cond_info ulp_wh_plus_class_cond_list[] = {
 	.cond_opcode = BNXT_ULP_COND_OPC_CF_IS_SET,
 	.cond_operand = BNXT_ULP_CF_IDX_WC_MATCH
 	},
-	/* cond_execute: class_tid: 3, l2_cntxt_tcam_cache.rd */
+	/* cond_execute: class_tid: 3, port_table.rd */
 	{
 	.cond_opcode = BNXT_ULP_COND_OPC_FIELD_BIT_NOT_SET,
 	.cond_operand = BNXT_ULP_GLB_HF_ID_O_ETH_SMAC
@@ -2087,12 +2206,12 @@ struct bnxt_ulp_mapper_cond_info ulp_wh_plus_class_cond_list[] = {
 	.cond_opcode = BNXT_ULP_COND_OPC_RF_IS_SET,
 	.cond_operand = BNXT_ULP_RF_IDX_GENERIC_TBL_MISS
 	},
-	/* cond_execute: class_tid: 5, control.vf_0 */
+	/* cond_execute: class_tid: 5, control.prof_tcam_cache.vfr_glb_act_rec_rd.0 */
 	{
 	.cond_opcode = BNXT_ULP_COND_OPC_RF_IS_SET,
 	.cond_operand = BNXT_ULP_RF_IDX_GENERIC_TBL_MISS
 	},
-	/* cond_execute: class_tid: 5, control.vfr_0 */
+	/* cond_execute: class_tid: 5, control.vfr_port_0 */
 	{
 	.cond_opcode = BNXT_ULP_COND_OPC_RF_IS_SET,
 	.cond_operand = BNXT_ULP_RF_IDX_GENERIC_TBL_MISS
@@ -2668,7 +2787,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 	{
 	.field_info_mask = {
 		.description = "hdr_sig_id",
-		.field_bit_size = 5,
+		.field_bit_size = 6,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
 		.field_opr1 = {
@@ -2676,7 +2795,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		},
 	.field_info_spec = {
 		.description = "hdr_sig_id",
-		.field_bit_size = 5,
+		.field_bit_size = 6,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
 		.field_opr1 = {
@@ -4739,7 +4858,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 	{
 	.field_info_mask = {
 		.description = "hdr_sig_id",
-		.field_bit_size = 5,
+		.field_bit_size = 6,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
 		.field_opr1 = {
@@ -4747,7 +4866,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		},
 	.field_info_spec = {
 		.description = "hdr_sig_id",
-		.field_bit_size = 5,
+		.field_bit_size = 6,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
 		.field_opr1 = {
@@ -6662,7 +6781,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 	{
 	.field_info_mask = {
 		.description = "hdr_sig_id",
-		.field_bit_size = 5,
+		.field_bit_size = 6,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
 		.field_opr1 = {
@@ -6670,7 +6789,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		},
 	.field_info_spec = {
 		.description = "hdr_sig_id",
-		.field_bit_size = 5,
+		.field_bit_size = 6,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
 		.field_opr1 = {
@@ -7397,7 +7516,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 	{
 	.field_info_mask = {
 		.description = "hdr_sig_id",
-		.field_bit_size = 5,
+		.field_bit_size = 6,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
 		.field_opr1 = {
@@ -7405,7 +7524,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		},
 	.field_info_spec = {
 		.description = "hdr_sig_id",
-		.field_bit_size = 5,
+		.field_bit_size = 6,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
 		.field_opr1 = {
@@ -7689,25 +7808,24 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}
 		}
 	},
-	/* class_tid: 3, , table: l2_cntxt_tcam_cache.rd */
+	/* class_tid: 3, , table: port_table.rd */
 	{
 	.field_info_mask = {
-		.description = "svif",
+		.description = "dev.port_id",
 		.field_bit_size = 8,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
 		.field_opr1 = {
-		(BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,
-		BNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "svif",
+		.description = "dev.port_id",
 		.field_bit_size = 8,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_HF,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
 		.field_opr1 = {
-		(BNXT_ULP_GLB_HF_ID_SVIF_INDEX >> 8) & 0xff,
-		BNXT_ULP_GLB_HF_ID_SVIF_INDEX & 0xff}
+		(BNXT_ULP_CF_IDX_DEV_PORT_ID >> 8) & 0xff,
+		BNXT_ULP_CF_IDX_DEV_PORT_ID & 0xff}
 		}
 	},
 	/* class_tid: 3, , table: mac_addr_cache.rd */
@@ -8257,7 +8375,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 	{
 	.field_info_mask = {
 		.description = "hdr_sig_id",
-		.field_bit_size = 5,
+		.field_bit_size = 6,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
 		.field_opr1 = {
@@ -8265,7 +8383,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		},
 	.field_info_spec = {
 		.description = "hdr_sig_id",
-		.field_bit_size = 5,
+		.field_bit_size = 6,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
 		.field_opr1 = {
@@ -9686,7 +9804,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 	{
 	.field_info_mask = {
 		.description = "hdr_sig_id",
-		.field_bit_size = 5,
+		.field_bit_size = 6,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
 		.field_opr1 = {
@@ -9694,7 +9812,7 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		},
 	.field_info_spec = {
 		.description = "hdr_sig_id",
-		.field_bit_size = 5,
+		.field_bit_size = 6,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
 		.field_opr1 = {
@@ -11234,27 +11352,55 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		BNXT_ULP_CF_IDX_DRV_FUNC_SVIF & 0xff}
 		}
 	},
-	/* class_tid: 5, , table: l2_cntxt_tcam_cache.vf_rd_egr */
+	/* class_tid: 5, , table: profile_tcam_cache.vfr_glb_act_rec_rd */
 	{
 	.field_info_mask = {
-		.description = "svif",
-		.field_bit_size = 8,
+		.description = "recycle_cnt",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "recycle_cnt",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "prof_func_id",
+		.field_bit_size = 7,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
 		.field_opr1 = {
 			0xff}
 		},
 	.field_info_spec = {
-		.description = "svif",
-		.field_bit_size = 8,
+		.description = "prof_func_id",
+		.field_bit_size = 7,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+		.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
 		.field_opr1 = {
-		(BNXT_ULP_CF_IDX_VF_FUNC_SVIF >> 8) & 0xff,
-		BNXT_ULP_CF_IDX_VF_FUNC_SVIF & 0xff}
+		(BNXT_ULP_GLB_RF_IDX_VF_2_VFR_PROF_FUNC_ID >> 8) & 0xff,
+		BNXT_ULP_GLB_RF_IDX_VF_2_VFR_PROF_FUNC_ID & 0xff}
 		}
 	},
-	/* class_tid: 5, , table: l2_cntxt_tcam.vf_egr */
+	{
+	.field_info_mask = {
+		.description = "hdr_sig_id",
+		.field_bit_size = 6,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "hdr_sig_id",
+		.field_bit_size = 6,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	/* class_tid: 5, , table: l2_cntxt_tcam.vf_vfr_ing */
 	{
 	.field_info_mask = {
 		.description = "l2_ivlan_vid",
@@ -11288,13 +11434,27 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.description = "mac0_addr",
 		.field_bit_size = 48,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff}
 		},
 	.field_info_spec = {
 		.description = "mac0_addr",
 		.field_bit_size = 48,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0x00,
+			0x0a,
+			0xf7,
+			0xaa,
+			0x10,
+			0x00}
 		}
 	},
 	{
@@ -11302,18 +11462,13 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.description = "svif",
 		.field_bit_size = 8,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-		.field_opr1 = {
-			0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
 		.description = "svif",
 		.field_bit_size = 8,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
-		.field_opr1 = {
-		(BNXT_ULP_CF_IDX_VF_FUNC_SVIF >> 8) & 0xff,
-		BNXT_ULP_CF_IDX_VF_FUNC_SVIF & 0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
@@ -11363,13 +11518,27 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.description = "mac1_addr",
 		.field_bit_size = 48,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff}
 		},
 	.field_info_spec = {
 		.description = "mac1_addr",
 		.field_bit_size = 48,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0x00,
+			0x0a,
+			0xf7,
+			0xaa,
+			0x10,
+			0x02}
 		}
 	},
 	{
@@ -11405,13 +11574,18 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.description = "tun_hdr_type",
 		.field_bit_size = 4,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
 		.description = "tun_hdr_type",
 		.field_bit_size = 4,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+		.field_opr1 = {
+		(BNXT_ULP_CF_IDX_L2_CUSTOM_UPAR_ID >> 8) & 0xff,
+		BNXT_ULP_CF_IDX_L2_CUSTOM_UPAR_ID & 0xff}
 		}
 	},
 	{
@@ -11419,13 +11593,17 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		.description = "key_type",
 		.field_bit_size = 2,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+		3}
 		},
 	.field_info_spec = {
 		.description = "key_type",
 		.field_bit_size = 2,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+		2}
 		}
 	},
 	{
@@ -11446,97 +11624,114 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		1}
 		}
 	},
-	/* class_tid: 5, , table: l2_cntxt_tcam_cache.vf_egr_wr */
+	/* class_tid: 5, , table: profile_tcam.vf_vfr_ing */
 	{
 	.field_info_mask = {
-		.description = "svif",
-		.field_bit_size = 8,
+		.description = "l4_hdr_is_udp_tcp",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-		.field_opr1 = {
-			0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "svif",
-		.field_bit_size = 8,
+		.description = "l4_hdr_is_udp_tcp",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
-		.field_opr1 = {
-		(BNXT_ULP_CF_IDX_VF_FUNC_SVIF >> 8) & 0xff,
-		BNXT_ULP_CF_IDX_VF_FUNC_SVIF & 0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
-	/* class_tid: 5, , table: l2_cntxt_tcam_bypass.vf_ing */
 	{
 	.field_info_mask = {
-		.description = "l2_ivlan_vid",
-		.field_bit_size = 12,
+		.description = "l4_hdr_type",
+		.field_bit_size = 4,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "l2_ivlan_vid",
-		.field_bit_size = 12,
-		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.description = "l4_hdr_type",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "l2_ovlan_vid",
-		.field_bit_size = 12,
+		.description = "l4_hdr_error",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "l2_ovlan_vid",
-		.field_bit_size = 12,
+		.description = "l4_hdr_error",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "mac0_addr",
-		.field_bit_size = 48,
+		.description = "l4_hdr_valid",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "mac0_addr",
-		.field_bit_size = 48,
+		.description = "l4_hdr_valid",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "svif",
-		.field_bit_size = 8,
+		.description = "l3_ipv6_cmp_dst",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-		.field_opr1 = {
-			0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "svif",
-		.field_bit_size = 8,
+		.description = "l3_ipv6_cmp_dst",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
-		.field_opr1 = {
-		(BNXT_ULP_CF_IDX_VF_FUNC_SVIF >> 8) & 0xff,
-		BNXT_ULP_CF_IDX_VF_FUNC_SVIF & 0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "sparif",
+		.description = "l3_ipv6_cmp_src",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "l3_ipv6_cmp_src",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "l3_hdr_isIP",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "l3_hdr_isIP",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "l3_hdr_type",
 		.field_bit_size = 4,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "sparif",
+		.description = "l3_hdr_type",
 		.field_bit_size = 4,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
@@ -11544,69 +11739,69 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 	},
 	{
 	.field_info_mask = {
-		.description = "tl2_ivlan_vid",
-		.field_bit_size = 12,
+		.description = "l3_hdr_error",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "tl2_ivlan_vid",
-		.field_bit_size = 12,
+		.description = "l3_hdr_error",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "tl2_ovlan_vid",
-		.field_bit_size = 12,
+		.description = "l3_hdr_valid",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "tl2_ovlan_vid",
-		.field_bit_size = 12,
+		.description = "l3_hdr_valid",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "mac1_addr",
-		.field_bit_size = 48,
+		.description = "l2_two_vtags",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "mac1_addr",
-		.field_bit_size = 48,
+		.description = "l2_two_vtags",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "l2_num_vtags",
-		.field_bit_size = 2,
+		.description = "l2_vtag_present",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "l2_num_vtags",
-		.field_bit_size = 2,
+		.description = "l2_vtag_present",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "tl2_num_vtags",
+		.description = "l2_uc_mc_bc",
 		.field_bit_size = 2,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "tl2_num_vtags",
+		.description = "l2_uc_mc_bc",
 		.field_bit_size = 2,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
@@ -11614,141 +11809,125 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 	},
 	{
 	.field_info_mask = {
-		.description = "tun_hdr_type",
-		.field_bit_size = 4,
+		.description = "l2_hdr_type",
+		.field_bit_size = 2,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "tun_hdr_type",
-		.field_bit_size = 4,
+		.description = "l2_hdr_type",
+		.field_bit_size = 2,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "key_type",
-		.field_bit_size = 2,
+		.description = "l2_hdr_error",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "key_type",
-		.field_bit_size = 2,
+		.description = "l2_hdr_error",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "valid",
+		.description = "l2_hdr_valid",
 		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-		1}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "valid",
+		.description = "l2_hdr_valid",
 		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-		1}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
-	/* class_tid: 5, , table: l2_cntxt_tcam_cache.vfr_rd_egr0 */
 	{
 	.field_info_mask = {
-		.description = "svif",
-		.field_bit_size = 8,
+		.description = "tun_hdr_flags",
+		.field_bit_size = 3,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-		.field_opr1 = {
-			0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "svif",
-		.field_bit_size = 8,
+		.description = "tun_hdr_flags",
+		.field_bit_size = 3,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
-		.field_opr1 = {
-		(BNXT_ULP_CF_IDX_DRV_FUNC_SVIF >> 8) & 0xff,
-		BNXT_ULP_CF_IDX_DRV_FUNC_SVIF & 0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
-	/* class_tid: 5, , table: l2_cntxt_tcam_bypass.vfr_egr0 */
 	{
 	.field_info_mask = {
-		.description = "l2_ivlan_vid",
-		.field_bit_size = 12,
+		.description = "tun_hdr_type",
+		.field_bit_size = 4,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "l2_ivlan_vid",
-		.field_bit_size = 12,
+		.description = "tun_hdr_type",
+		.field_bit_size = 4,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "l2_ovlan_vid",
-		.field_bit_size = 12,
+		.description = "tun_hdr_err",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "l2_ovlan_vid",
-		.field_bit_size = 12,
+		.description = "tun_hdr_err",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "mac0_addr",
-		.field_bit_size = 48,
+		.description = "tun_hdr_valid",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "mac0_addr",
-		.field_bit_size = 48,
+		.description = "tun_hdr_valid",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "svif",
-		.field_bit_size = 8,
+		.description = "tl4_hdr_is_udp_tcp",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-		.field_opr1 = {
-			0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "svif",
-		.field_bit_size = 8,
+		.description = "tl4_hdr_is_udp_tcp",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
-		.field_opr1 = {
-		(BNXT_ULP_CF_IDX_DRV_FUNC_SVIF >> 8) & 0xff,
-		BNXT_ULP_CF_IDX_DRV_FUNC_SVIF & 0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "sparif",
+		.description = "tl4_hdr_type",
 		.field_bit_size = 4,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "sparif",
+		.description = "tl4_hdr_type",
 		.field_bit_size = 4,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
@@ -11756,83 +11935,83 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 	},
 	{
 	.field_info_mask = {
-		.description = "tl2_ivlan_vid",
-		.field_bit_size = 12,
+		.description = "tl4_hdr_error",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "tl2_ivlan_vid",
-		.field_bit_size = 12,
+		.description = "tl4_hdr_error",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "tl2_ovlan_vid",
-		.field_bit_size = 12,
+		.description = "tl4_hdr_valid",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "tl2_ovlan_vid",
-		.field_bit_size = 12,
+		.description = "tl4_hdr_valid",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "mac1_addr",
-		.field_bit_size = 48,
+		.description = "tl3_ipv6_cmp_dst",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "mac1_addr",
-		.field_bit_size = 48,
+		.description = "tl3_ipv6_cmp_dst",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "l2_num_vtags",
-		.field_bit_size = 2,
+		.description = "tl3_ipv6_cmp_src",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "l2_num_vtags",
-		.field_bit_size = 2,
+		.description = "tl3_ipv6_cmp_src",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "tl2_num_vtags",
-		.field_bit_size = 2,
+		.description = "tl3_hdr_isIP",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "tl2_num_vtags",
-		.field_bit_size = 2,
+		.description = "tl3_hdr_isIP",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "tun_hdr_type",
+		.description = "tl3_hdr_type",
 		.field_bit_size = 4,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "tun_hdr_type",
+		.description = "tl3_hdr_type",
 		.field_bit_size = 4,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
@@ -11840,207 +12019,172 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 	},
 	{
 	.field_info_mask = {
-		.description = "key_type",
-		.field_bit_size = 2,
+		.description = "tl3_hdr_error",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "key_type",
-		.field_bit_size = 2,
+		.description = "tl3_hdr_error",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "valid",
+		.description = "tl3_hdr_valid",
 		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-		1}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "valid",
+		.description = "tl3_hdr_valid",
 		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-		1}
-		}
-	},
-	/* class_tid: 5, , table: l2_cntxt_tcam_cache.vfr_wr_egr0 */
-	{
-	.field_info_mask = {
-		.description = "svif",
-		.field_bit_size = 8,
-		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-		.field_opr1 = {
-			0xff}
-		},
-	.field_info_spec = {
-		.description = "svif",
-		.field_bit_size = 8,
-		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
-		.field_opr1 = {
-		(BNXT_ULP_CF_IDX_DRV_FUNC_SVIF >> 8) & 0xff,
-		BNXT_ULP_CF_IDX_DRV_FUNC_SVIF & 0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
-	/* class_tid: 5, , table: l2_cntxt_tcam_bypass.vfr_dtagged_ing0 */
 	{
 	.field_info_mask = {
-		.description = "l2_ivlan_vid",
-		.field_bit_size = 12,
+		.description = "tl2_two_vtags",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "l2_ivlan_vid",
-		.field_bit_size = 12,
+		.description = "tl2_two_vtags",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "l2_ovlan_vid",
-		.field_bit_size = 12,
+		.description = "tl2_vtag_present",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-		.field_opr1 = {
-			0xff,
-			0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "l2_ovlan_vid",
-		.field_bit_size = 12,
+		.description = "tl2_vtag_present",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
-		.field_opr1 = {
-		(BNXT_ULP_CF_IDX_DEV_PORT_ID >> 8) & 0xff,
-		BNXT_ULP_CF_IDX_DEV_PORT_ID & 0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "mac0_addr",
-		.field_bit_size = 48,
+		.description = "tl2_uc_mc_bc",
+		.field_bit_size = 2,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "mac0_addr",
-		.field_bit_size = 48,
+		.description = "tl2_uc_mc_bc",
+		.field_bit_size = 2,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "svif",
-		.field_bit_size = 8,
+		.description = "tl2_hdr_type",
+		.field_bit_size = 2,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-		.field_opr1 = {
-			0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "svif",
-		.field_bit_size = 8,
+		.description = "tl2_hdr_type",
+		.field_bit_size = 2,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
-		.field_opr1 = {
-		(BNXT_ULP_CF_IDX_DRV_FUNC_SVIF >> 8) & 0xff,
-		BNXT_ULP_CF_IDX_DRV_FUNC_SVIF & 0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "sparif",
-		.field_bit_size = 4,
+		.description = "tl2_hdr_valid",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "sparif",
-		.field_bit_size = 4,
+		.description = "tl2_hdr_valid",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "tl2_ivlan_vid",
-		.field_bit_size = 12,
+		.description = "hrec_next",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "tl2_ivlan_vid",
-		.field_bit_size = 12,
+		.description = "hrec_next",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "tl2_ovlan_vid",
-		.field_bit_size = 12,
+		.description = "reserved",
+		.field_bit_size = 9,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "tl2_ovlan_vid",
-		.field_bit_size = 12,
+		.description = "reserved",
+		.field_bit_size = 9,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "mac1_addr",
-		.field_bit_size = 48,
+		.description = "prof_func_id",
+		.field_bit_size = 7,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "mac1_addr",
-		.field_bit_size = 48,
+		.description = "prof_func_id",
+		.field_bit_size = 7,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
+		.field_opr1 = {
+		(BNXT_ULP_GLB_RF_IDX_VF_2_VFR_PROF_FUNC_ID >> 8) & 0xff,
+		BNXT_ULP_GLB_RF_IDX_VF_2_VFR_PROF_FUNC_ID & 0xff}
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "l2_num_vtags",
-		.field_bit_size = 2,
+		.description = "agg_error",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-		.field_opr1 = {
-			0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "l2_num_vtags",
-		.field_bit_size = 2,
+		.description = "agg_error",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-		2}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "tl2_num_vtags",
+		.description = "recycle_cnt",
 		.field_bit_size = 2,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "tl2_num_vtags",
+		.description = "recycle_cnt",
 		.field_bit_size = 2,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
@@ -12048,27 +12192,27 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 	},
 	{
 	.field_info_mask = {
-		.description = "tun_hdr_type",
-		.field_bit_size = 4,
+		.description = "pkt_type_0",
+		.field_bit_size = 2,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "tun_hdr_type",
-		.field_bit_size = 4,
+		.description = "pkt_type_0",
+		.field_bit_size = 2,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "key_type",
+		.description = "pkt_type_1",
 		.field_bit_size = 2,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "key_type",
+		.description = "pkt_type_1",
 		.field_bit_size = 2,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
@@ -12092,206 +12236,1430 @@ struct bnxt_ulp_mapper_key_info ulp_wh_plus_class_key_info_list[] = {
 		1}
 		}
 	},
-	/* class_tid: 5, , table: l2_cntxt_tcam_bypass.vfr_stagged_ing0 */
+	/* class_tid: 5, , table: profile_tcam.any_vf_ing */
 	{
 	.field_info_mask = {
-		.description = "l2_ivlan_vid",
-		.field_bit_size = 12,
+		.description = "l4_hdr_is_udp_tcp",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-		.field_opr1 = {
-			0xff,
-			0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "l2_ivlan_vid",
-		.field_bit_size = 12,
+		.description = "l4_hdr_is_udp_tcp",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
-		.field_opr1 = {
-		(BNXT_ULP_CF_IDX_DEV_PORT_ID >> 8) & 0xff,
-		BNXT_ULP_CF_IDX_DEV_PORT_ID & 0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "l2_ovlan_vid",
-		.field_bit_size = 12,
+		.description = "l4_hdr_type",
+		.field_bit_size = 4,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "l2_ovlan_vid",
-		.field_bit_size = 12,
+		.description = "l4_hdr_type",
+		.field_bit_size = 4,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "mac0_addr",
-		.field_bit_size = 48,
+		.description = "l4_hdr_error",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "mac0_addr",
-		.field_bit_size = 48,
+		.description = "l4_hdr_error",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "svif",
-		.field_bit_size = 8,
+		.description = "l4_hdr_valid",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-		.field_opr1 = {
-			0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "svif",
-		.field_bit_size = 8,
+		.description = "l4_hdr_valid",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
-		.field_opr1 = {
-		(BNXT_ULP_CF_IDX_DRV_FUNC_SVIF >> 8) & 0xff,
-		BNXT_ULP_CF_IDX_DRV_FUNC_SVIF & 0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "sparif",
-		.field_bit_size = 4,
+		.description = "l3_ipv6_cmp_dst",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "sparif",
-		.field_bit_size = 4,
+		.description = "l3_ipv6_cmp_dst",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "tl2_ivlan_vid",
-		.field_bit_size = 12,
+		.description = "l3_ipv6_cmp_src",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "tl2_ivlan_vid",
-		.field_bit_size = 12,
+		.description = "l3_ipv6_cmp_src",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "tl2_ovlan_vid",
-		.field_bit_size = 12,
+		.description = "l3_hdr_isIP",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "tl2_ovlan_vid",
-		.field_bit_size = 12,
+		.description = "l3_hdr_isIP",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "mac1_addr",
-		.field_bit_size = 48,
+		.description = "l3_hdr_type",
+		.field_bit_size = 4,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "mac1_addr",
-		.field_bit_size = 48,
+		.description = "l3_hdr_type",
+		.field_bit_size = 4,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "l2_num_vtags",
-		.field_bit_size = 2,
+		.description = "l3_hdr_error",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
-		.field_opr1 = {
-			0xff}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "l2_num_vtags",
-		.field_bit_size = 2,
+		.description = "l3_hdr_error",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-		.field_opr1 = {
-		1}
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "tl2_num_vtags",
-		.field_bit_size = 2,
+		.description = "l3_hdr_valid",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "tl2_num_vtags",
-		.field_bit_size = 2,
+		.description = "l3_hdr_valid",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "tun_hdr_type",
-		.field_bit_size = 4,
+		.description = "l2_two_vtags",
+		.field_bit_size = 1,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "tun_hdr_type",
-		.field_bit_size = 4,
+		.description = "l2_two_vtags",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "l2_vtag_present",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "l2_vtag_present",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "l2_uc_mc_bc",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "l2_uc_mc_bc",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "l2_hdr_type",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "l2_hdr_type",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "l2_hdr_error",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "l2_hdr_error",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "l2_hdr_valid",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "l2_hdr_valid",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tun_hdr_flags",
+		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "tun_hdr_flags",
+		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tun_hdr_type",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "tun_hdr_type",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tun_hdr_err",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "tun_hdr_err",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tun_hdr_valid",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "tun_hdr_valid",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tl4_hdr_is_udp_tcp",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "tl4_hdr_is_udp_tcp",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tl4_hdr_type",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "tl4_hdr_type",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tl4_hdr_error",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "tl4_hdr_error",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tl4_hdr_valid",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "tl4_hdr_valid",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tl3_ipv6_cmp_dst",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "tl3_ipv6_cmp_dst",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tl3_ipv6_cmp_src",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "tl3_ipv6_cmp_src",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tl3_hdr_isIP",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "tl3_hdr_isIP",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tl3_hdr_type",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "tl3_hdr_type",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tl3_hdr_error",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "tl3_hdr_error",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tl3_hdr_valid",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "tl3_hdr_valid",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tl2_two_vtags",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "tl2_two_vtags",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tl2_vtag_present",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "tl2_vtag_present",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tl2_uc_mc_bc",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "tl2_uc_mc_bc",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tl2_hdr_type",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "tl2_hdr_type",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tl2_hdr_valid",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "tl2_hdr_valid",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "hrec_next",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "hrec_next",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "reserved",
+		.field_bit_size = 9,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "reserved",
+		.field_bit_size = 9,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "prof_func_id",
+		.field_bit_size = 7,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "prof_func_id",
+		.field_bit_size = 7,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
+		.field_opr1 = {
+		(BNXT_ULP_GLB_RF_IDX_ANY_2_VF_PROF_FUNC_ID >> 8) & 0xff,
+		BNXT_ULP_GLB_RF_IDX_ANY_2_VF_PROF_FUNC_ID & 0xff}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "agg_error",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "agg_error",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "recycle_cnt",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "recycle_cnt",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "pkt_type_0",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "pkt_type_0",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "pkt_type_1",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "pkt_type_1",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "valid",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+		1}
+		},
+	.field_info_spec = {
+		.description = "valid",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+		1}
+		}
+	},
+	/* class_tid: 5, , table: l2_cntxt_tcam.vfr_vf_ing */
+	{
+	.field_info_mask = {
+		.description = "l2_ivlan_vid",
+		.field_bit_size = 12,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "l2_ivlan_vid",
+		.field_bit_size = 12,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "l2_ovlan_vid",
+		.field_bit_size = 12,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "l2_ovlan_vid",
+		.field_bit_size = 12,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "mac0_addr",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "mac0_addr",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0x00,
+			0x0a,
+			0xf7,
+			0xaa,
+			0x10,
+			0x00}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "svif",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "svif",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "sparif",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "sparif",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tl2_ivlan_vid",
+		.field_bit_size = 12,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "tl2_ivlan_vid",
+		.field_bit_size = 12,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tl2_ovlan_vid",
+		.field_bit_size = 12,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "tl2_ovlan_vid",
+		.field_bit_size = 12,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "mac1_addr",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff,
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "mac1_addr",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+			0x00,
+			0x0a,
+			0xf7,
+			0xaa,
+			0x10,
+			0x01}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "l2_num_vtags",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "l2_num_vtags",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tl2_num_vtags",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "tl2_num_vtags",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tun_hdr_type",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "tun_hdr_type",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+		.field_opr1 = {
+		(BNXT_ULP_CF_IDX_L2_CUSTOM_UPAR_ID >> 8) & 0xff,
+		BNXT_ULP_CF_IDX_L2_CUSTOM_UPAR_ID & 0xff}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "key_type",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+		3}
+		},
+	.field_info_spec = {
+		.description = "key_type",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+		2}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "valid",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+		1}
+		},
+	.field_info_spec = {
+		.description = "valid",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+		1}
+		}
+	},
+	/* class_tid: 5, , table: profile_tcam_cache.vfr_glb_act_rec_wr */
+	{
+	.field_info_mask = {
+		.description = "recycle_cnt",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "recycle_cnt",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "prof_func_id",
+		.field_bit_size = 7,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "prof_func_id",
+		.field_bit_size = 7,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
+		.field_opr1 = {
+		(BNXT_ULP_GLB_RF_IDX_VF_2_VFR_PROF_FUNC_ID >> 8) & 0xff,
+		BNXT_ULP_GLB_RF_IDX_VF_2_VFR_PROF_FUNC_ID & 0xff}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "hdr_sig_id",
+		.field_bit_size = 6,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "hdr_sig_id",
+		.field_bit_size = 6,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	/* class_tid: 5, , table: port_table.vfr_rd */
+	{
+	.field_info_mask = {
+		.description = "dev.port_id",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "dev.port_id",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+		.field_opr1 = {
+		(BNXT_ULP_CF_IDX_DEV_PORT_ID >> 8) & 0xff,
+		BNXT_ULP_CF_IDX_DEV_PORT_ID & 0xff}
+		}
+	},
+	/* class_tid: 5, , table: l2_cntxt_tcam.vf_egr */
+	{
+	.field_info_mask = {
+		.description = "l2_ivlan_vid",
+		.field_bit_size = 12,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "l2_ivlan_vid",
+		.field_bit_size = 12,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "l2_ovlan_vid",
+		.field_bit_size = 12,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "l2_ovlan_vid",
+		.field_bit_size = 12,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "mac0_addr",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "mac0_addr",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "svif",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "svif",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+		.field_opr1 = {
+		(BNXT_ULP_CF_IDX_VF_FUNC_SVIF >> 8) & 0xff,
+		BNXT_ULP_CF_IDX_VF_FUNC_SVIF & 0xff}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "sparif",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "sparif",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tl2_ivlan_vid",
+		.field_bit_size = 12,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "tl2_ivlan_vid",
+		.field_bit_size = 12,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tl2_ovlan_vid",
+		.field_bit_size = 12,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "tl2_ovlan_vid",
+		.field_bit_size = 12,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "mac1_addr",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "mac1_addr",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "l2_num_vtags",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "l2_num_vtags",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tl2_num_vtags",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "tl2_num_vtags",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tun_hdr_type",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "tun_hdr_type",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "key_type",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "key_type",
+		.field_bit_size = 2,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "valid",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+		1}
+		},
+	.field_info_spec = {
+		.description = "valid",
+		.field_bit_size = 1,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_opr1 = {
+		1}
+		}
+	},
+	/* class_tid: 5, , table: em.vfr */
+	{
+	.field_info_mask = {
+		.description = "spare",
+		.field_bit_size = 5,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "spare",
+		.field_bit_size = 5,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "local_cos",
+		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "local_cos",
+		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "l2.etype",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "l2.etype",
+		.field_bit_size = 16,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "l2.vid",
+		.field_bit_size = 12,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "l2.vid",
+		.field_bit_size = 12,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "l2.dst",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "l2.dst",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "svif",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "svif",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+		.field_opr1 = {
+		(BNXT_ULP_CF_IDX_VF_FUNC_SVIF >> 8) & 0xff,
+		BNXT_ULP_CF_IDX_VF_FUNC_SVIF & 0xff}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "partition",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "partition",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "em_profile_id",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "em_profile_id",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
+		.field_opr1 = {
+		(BNXT_ULP_GLB_RF_IDX_GLB_VFR_EM_PROF_ID_0 >> 8) & 0xff,
+		BNXT_ULP_GLB_RF_IDX_GLB_VFR_EM_PROF_ID_0 & 0xff}
+		}
+	},
+	/* class_tid: 5, , table: em.any_vf */
+	{
+	.field_info_mask = {
+		.description = "spare",
+		.field_bit_size = 7,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "spare",
+		.field_bit_size = 7,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tun_type",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "tun_type",
+		.field_bit_size = 4,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+		.field_opr1 = {
+		(BNXT_ULP_CF_IDX_L2_CUSTOM_UPAR_ID >> 8) & 0xff,
+		BNXT_ULP_CF_IDX_L2_CUSTOM_UPAR_ID & 0xff}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "local_cos",
+		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "local_cos",
+		.field_bit_size = 3,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "l2_ivlan_vid",
+		.field_bit_size = 12,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "l2_ivlan_vid",
+		.field_bit_size = 12,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "key_type",
-		.field_bit_size = 2,
+		.description = "l2_ovlan_vid",
+		.field_bit_size = 12,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		},
 	.field_info_spec = {
-		.description = "key_type",
-		.field_bit_size = 2,
+		.description = "l2_ovlan_vid",
+		.field_bit_size = 12,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 		}
 	},
 	{
 	.field_info_mask = {
-		.description = "valid",
-		.field_bit_size = 1,
+		.description = "l2.dst",
+		.field_bit_size = 48,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "l2.dst",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tun_id",
+		.field_bit_size = 32,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
 		.field_opr1 = {
-		1}
+			0xff,
+			0xff,
+			0xff,
+			0xff}
 		},
 	.field_info_spec = {
-		.description = "valid",
-		.field_bit_size = 1,
+		.description = "tun_id",
+		.field_bit_size = 32,
 		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-		.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
 		.field_opr1 = {
-		1}
+		(BNXT_ULP_CF_IDX_VF_META_FID >> 8) & 0xff,
+		BNXT_ULP_CF_IDX_VF_META_FID & 0xff}
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tl2_ivlan_vid",
+		.field_bit_size = 12,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "tl2_ivlan_vid",
+		.field_bit_size = 12,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tl2_ovlan_vid",
+		.field_bit_size = 12,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "tl2_ovlan_vid",
+		.field_bit_size = 12,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "tl2.dst",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "tl2.dst",
+		.field_bit_size = 48,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "l2_cntxt_id",
+		.field_bit_size = 10,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		},
+	.field_info_spec = {
+		.description = "l2_cntxt_id",
+		.field_bit_size = 10,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+		}
+	},
+	{
+	.field_info_mask = {
+		.description = "em_profile_id",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "em_profile_id",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
+		.field_opr1 = {
+		(BNXT_ULP_GLB_RF_IDX_GLB_VFR_EM_PROF_ID_1 >> 8) & 0xff,
+		BNXT_ULP_GLB_RF_IDX_GLB_VFR_EM_PROF_ID_1 & 0xff}
+		}
+	},
+	/* class_tid: 5, , table: port_table.vfr_wr */
+	{
+	.field_info_mask = {
+		.description = "dev.port_id",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_ONES,
+		.field_opr1 = {
+			0xff}
+		},
+	.field_info_spec = {
+		.description = "dev.port_id",
+		.field_bit_size = 8,
+		.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+		.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+		.field_opr1 = {
+		(BNXT_ULP_CF_IDX_DEV_PORT_ID >> 8) & 0xff,
+		BNXT_ULP_CF_IDX_DEV_PORT_ID & 0xff}
 		}
 	}
 };
@@ -14166,89 +15534,219 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.description = "em_key_mask.8",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "em_key_mask.9",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "em_key_id",
+	.field_bit_size = 5,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	7}
+	},
+	{
+	.description = "em_profile_id",
+	.field_bit_size = 8,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}
+	},
+	{
+	.description = "em_search_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	1}
+	},
+	{
+	.description = "pl_byp_lkup_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	/* class_tid: 3, , table: profile_tcam_cache.wr */
+	{
+	.description = "rid",
+	.field_bit_size = 32,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_RID >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_RID & 0xff}
+	},
+	{
+	.description = "profile_tcam_index",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_PROFILE_TCAM_INDEX_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_PROFILE_TCAM_INDEX_0 & 0xff}
+	},
+	{
+	.description = "em_profile_id",
+	.field_bit_size = 8,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}
+	},
+	{
+	.description = "wc_profile_id",
+	.field_bit_size = 8,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "flow_sig_id",
+	.field_bit_size = 64,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+	.field_opr1 = {
+	(BNXT_ULP_CF_IDX_FLOW_SIG_ID >> 8) & 0xff,
+	BNXT_ULP_CF_IDX_FLOW_SIG_ID & 0xff}
+	},
+	/* class_tid: 3, , table: em.ipv4 */
+	{
+	.description = "act_rec_ptr",
+	.field_bit_size = 33,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
+	},
+	{
+	.description = "ext_flow_cntr",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "act_rec_int",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "act_rec_size",
+	.field_bit_size = 5,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "key_size",
+	.field_bit_size = 9,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "reserved",
+	.field_bit_size = 11,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "strength",
+	.field_bit_size = 2,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	3}
 	},
 	{
-	.description = "em_key_mask.9",
+	.description = "l1_cacheable",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "em_key_id",
-	.field_bit_size = 5,
+	.description = "valid",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
-	7}
+	1}
 	},
+	/* class_tid: 3, , table: eem.ipv4 */
 	{
-	.description = "em_profile_id",
-	.field_bit_size = 8,
+	.description = "act_rec_ptr",
+	.field_bit_size = 33,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
 	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}
+	(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
 	},
 	{
-	.description = "em_search_en",
+	.description = "ext_flow_cntr",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-	1}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "pl_byp_lkup_en",
+	.description = "act_rec_int",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 3, , table: profile_tcam_cache.wr */
 	{
-	.description = "rid",
-	.field_bit_size = 32,
+	.description = "act_rec_size",
+	.field_bit_size = 5,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
 	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_RID >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_RID & 0xff}
+	(BNXT_ULP_RF_IDX_ACTION_REC_SIZE >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_ACTION_REC_SIZE & 0xff}
 	},
 	{
-	.description = "profile_tcam_index",
-	.field_bit_size = 10,
+	.description = "key_size",
+	.field_bit_size = 9,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_PROFILE_TCAM_INDEX_0 >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_PROFILE_TCAM_INDEX_0 & 0xff}
+	(173 >> 8) & 0xff,
+	173 & 0xff}
 	},
 	{
-	.description = "em_profile_id",
-	.field_bit_size = 8,
+	.description = "reserved",
+	.field_bit_size = 11,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "strength",
+	.field_bit_size = 2,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_EM_PROFILE_ID_0 & 0xff}
+	3}
 	},
 	{
-	.description = "wc_profile_id",
-	.field_bit_size = 8,
+	.description = "l1_cacheable",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "flow_sig_id",
-	.field_bit_size = 64,
+	.description = "valid",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
-	(BNXT_ULP_CF_IDX_FLOW_SIG_ID >> 8) & 0xff,
-	BNXT_ULP_CF_IDX_FLOW_SIG_ID & 0xff}
+	1}
 	},
-	/* class_tid: 3, , table: em.ipv4 */
+	/* class_tid: 3, , table: em.ipv6 */
 	{
 	.description = "act_rec_ptr",
 	.field_bit_size = 33,
@@ -14310,7 +15808,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.field_opr1 = {
 	1}
 	},
-	/* class_tid: 3, , table: eem.ipv4 */
+	/* class_tid: 3, , table: eem.ipv6 */
 	{
 	.description = "act_rec_ptr",
 	.field_bit_size = 33,
@@ -14347,8 +15845,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
-	(173 >> 8) & 0xff,
-	173 & 0xff}
+	(413 >> 8) & 0xff,
+	413 & 0xff}
 	},
 	{
 	.description = "reserved",
@@ -14374,141 +15872,325 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.description = "valid",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	1}
+	},
+	/* class_tid: 4, , table: int_full_act_record.ing_0 */
+	{
+	.description = "flow_cntr_ptr",
+	.field_bit_size = 14,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "age_enable",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "agg_cntr_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "rate_cntr_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "flow_cntr_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tcpflags_key",
+	.field_bit_size = 8,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tcpflags_mir",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tcpflags_match",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "encap_ptr",
+	.field_bit_size = 11,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "dst_ip_ptr",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tcp_dst_port",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "src_ip_ptr",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tcp_src_port",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "meter_id",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "l3_rdir",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tl3_rdir",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "l3_ttl_dec",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tl3_ttl_dec",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "decap_func",
+	.field_bit_size = 4,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "vnic_or_vport",
+	.field_bit_size = 12,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+	.field_opr1 = {
+	(BNXT_ULP_CF_IDX_DRV_FUNC_VNIC >> 8) & 0xff,
+	BNXT_ULP_CF_IDX_DRV_FUNC_VNIC & 0xff}
+	},
+	{
+	.description = "pop_vlan",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "meter",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "mirror",
+	.field_bit_size = 2,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "drop",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "hit",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "type",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	/* class_tid: 4, , table: l2_cntxt_tcam.ing_0 */
+	{
+	.description = "l2_cntxt_id",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
 	.field_opr1 = {
-	1}
+	(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}
 	},
-	/* class_tid: 3, , table: em.ipv6 */
 	{
-	.description = "act_rec_ptr",
-	.field_bit_size = 33,
+	.description = "prof_func_id",
+	.field_bit_size = 7,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
 	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
+	(BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,
+	BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID & 0xff}
 	},
 	{
-	.description = "ext_flow_cntr",
+	.description = "l2_byp_lkup_en",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "act_rec_int",
-	.field_bit_size = 1,
+	.description = "parif",
+	.field_bit_size = 4,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+	.field_opr1 = {
+	(BNXT_ULP_CF_IDX_PHY_PORT_PARIF >> 8) & 0xff,
+	BNXT_ULP_CF_IDX_PHY_PORT_PARIF & 0xff}
 	},
 	{
-	.description = "act_rec_size",
-	.field_bit_size = 5,
+	.description = "allowed_pri",
+	.field_bit_size = 8,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "key_size",
-	.field_bit_size = 9,
+	.description = "default_pri",
+	.field_bit_size = 3,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "reserved",
-	.field_bit_size = 11,
+	.description = "allowed_tpid",
+	.field_bit_size = 6,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "strength",
-	.field_bit_size = 2,
+	.description = "default_tpid",
+	.field_bit_size = 3,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-	3}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "l1_cacheable",
+	.description = "bd_act_en",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "valid",
+	.description = "sp_rec_ptr",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "byp_sp_lkup",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
 	1}
 	},
-	/* class_tid: 3, , table: eem.ipv6 */
 	{
-	.description = "act_rec_ptr",
-	.field_bit_size = 33,
+	.description = "pri_anti_spoof_ctl",
+	.field_bit_size = 2,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
-	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "ext_flow_cntr",
-	.field_bit_size = 1,
+	.description = "tpid_anti_spoof_ctl",
+	.field_bit_size = 2,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
+	/* class_tid: 4, , table: l2_cntxt_tcam_cache.ing_wr */
 	{
-	.description = "act_rec_int",
-	.field_bit_size = 1,
+	.description = "rid",
+	.field_bit_size = 32,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_RID >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_RID & 0xff}
 	},
 	{
-	.description = "act_rec_size",
-	.field_bit_size = 5,
+	.description = "l2_cntxt_tcam_index",
+	.field_bit_size = 10,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
 	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_ACTION_REC_SIZE >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_ACTION_REC_SIZE & 0xff}
+	(BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0 & 0xff}
 	},
 	{
-	.description = "key_size",
-	.field_bit_size = 9,
+	.description = "l2_cntxt_id",
+	.field_bit_size = 10,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
 	.field_opr1 = {
-	(413 >> 8) & 0xff,
-	413 & 0xff}
+	(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}
 	},
 	{
-	.description = "reserved",
-	.field_bit_size = 11,
+	.description = "src_property_ptr",
+	.field_bit_size = 10,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
+	/* class_tid: 4, , table: parif_def_lkup_arec_ptr.ing_0 */
 	{
-	.description = "strength",
-	.field_bit_size = 2,
+	.description = "act_rec_ptr",
+	.field_bit_size = 32,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
 	.field_opr1 = {
-	3}
+	(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
 	},
+	/* class_tid: 4, , table: parif_def_arec_ptr.ing_0 */
 	{
-	.description = "l1_cacheable",
-	.field_bit_size = 1,
+	.description = "act_rec_ptr",
+	.field_bit_size = 32,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
 	},
+	/* class_tid: 4, , table: parif_def_err_arec_ptr.ing_0 */
 	{
-	.description = "valid",
-	.field_bit_size = 1,
+	.description = "act_rec_ptr",
+	.field_bit_size = 32,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
 	.field_opr1 = {
-	1}
+	(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
 	},
-	/* class_tid: 4, , table: int_full_act_record.ing_0 */
+	/* class_tid: 4, , table: int_full_act_record.egr_vfr */
 	{
 	.description = "flow_cntr_ptr",
 	.field_bit_size = 14,
@@ -14629,8 +16311,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
 	.field_opr1 = {
-	(BNXT_ULP_CF_IDX_DRV_FUNC_VNIC >> 8) & 0xff,
-	BNXT_ULP_CF_IDX_DRV_FUNC_VNIC & 0xff}
+	(BNXT_ULP_CF_IDX_PHY_PORT_VPORT >> 8) & 0xff,
+	BNXT_ULP_CF_IDX_PHY_PORT_VPORT & 0xff}
 	},
 	{
 	.description = "pop_vlan",
@@ -14657,18 +16339,136 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "hit",
-	.field_bit_size = 1,
+	.description = "hit",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "type",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	/* class_tid: 4, , table: l2_cntxt_tcam_bypass.egr_vfr */
+	{
+	.description = "act_record_ptr",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "reserved",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "l2_byp_lkup_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	1}
+	},
+	{
+	.description = "parif",
+	.field_bit_size = 4,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	ULP_WP_SYM_LOOPBACK_PARIF}
+	},
+	{
+	.description = "allowed_pri",
+	.field_bit_size = 8,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "default_pri",
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "allowed_tpid",
+	.field_bit_size = 6,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "default_tpid",
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "bd_act_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	1}
+	},
+	{
+	.description = "sp_rec_ptr",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "byp_sp_lkup",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	1}
+	},
+	{
+	.description = "pri_anti_spoof_ctl",
+	.field_bit_size = 2,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "tpid_anti_spoof_ctl",
+	.field_bit_size = 2,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	/* class_tid: 4, , table: l2_cntxt_tcam_cache.egr_wr_vfr */
+	{
+	.description = "rid",
+	.field_bit_size = 32,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_RID >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_RID & 0xff}
+	},
+	{
+	.description = "l2_cntxt_tcam_index",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0 & 0xff}
+	},
+	{
+	.description = "l2_cntxt_id",
+	.field_bit_size = 10,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "type",
-	.field_bit_size = 1,
+	.description = "src_property_ptr",
+	.field_bit_size = 10,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 4, , table: l2_cntxt_tcam.ing_0 */
+	/* class_tid: 4, , table: l2_cntxt_tcam.egr_0 */
 	{
 	.description = "l2_cntxt_id",
 	.field_bit_size = 10,
@@ -14699,8 +16499,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
 	.field_opr1 = {
-	(BNXT_ULP_CF_IDX_PHY_PORT_PARIF >> 8) & 0xff,
-	BNXT_ULP_CF_IDX_PHY_PORT_PARIF & 0xff}
+	(BNXT_ULP_CF_IDX_DRV_FUNC_PARIF >> 8) & 0xff,
+	BNXT_ULP_CF_IDX_DRV_FUNC_PARIF & 0xff}
 	},
 	{
 	.description = "allowed_pri",
@@ -14758,7 +16558,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 4, , table: l2_cntxt_tcam_cache.ing_wr */
+	/* class_tid: 4, , table: l2_cntxt_tcam_cache.egr_wr */
 	{
 	.description = "rid",
 	.field_bit_size = 32,
@@ -14792,37 +16592,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 4, , table: parif_def_lkup_arec_ptr.ing_0 */
-	{
-	.description = "act_rec_ptr",
-	.field_bit_size = 32,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
-	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
-	},
-	/* class_tid: 4, , table: parif_def_arec_ptr.ing_0 */
-	{
-	.description = "act_rec_ptr",
-	.field_bit_size = 32,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
-	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
-	},
-	/* class_tid: 4, , table: parif_def_err_arec_ptr.ing_0 */
-	{
-	.description = "act_rec_ptr",
-	.field_bit_size = 32,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
-	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
-	},
-	/* class_tid: 4, , table: int_full_act_record.egr_vfr */
+	/* class_tid: 4, , table: int_full_act_record.egr_0 */
 	{
 	.description = "flow_cntr_ptr",
 	.field_bit_size = 14,
@@ -14982,250 +16752,128 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 4, , table: l2_cntxt_tcam_bypass.egr_vfr */
-	{
-	.description = "act_record_ptr",
-	.field_bit_size = 16,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "reserved",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "l2_byp_lkup_en",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-	1}
-	},
-	{
-	.description = "parif",
-	.field_bit_size = 4,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
-	.field_opr1 = {
-	(BNXT_ULP_CF_IDX_DRV_FUNC_PARIF >> 8) & 0xff,
-	BNXT_ULP_CF_IDX_DRV_FUNC_PARIF & 0xff}
-	},
-	{
-	.description = "allowed_pri",
-	.field_bit_size = 8,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "default_pri",
-	.field_bit_size = 3,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "allowed_tpid",
-	.field_bit_size = 6,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "default_tpid",
-	.field_bit_size = 3,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "bd_act_en",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-	1}
-	},
-	{
-	.description = "sp_rec_ptr",
-	.field_bit_size = 16,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "byp_sp_lkup",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-	1}
-	},
-	{
-	.description = "pri_anti_spoof_ctl",
-	.field_bit_size = 2,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "tpid_anti_spoof_ctl",
-	.field_bit_size = 2,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	/* class_tid: 4, , table: l2_cntxt_tcam_cache.egr_wr_vfr */
+	/* class_tid: 4, , table: parif_def_lkup_arec_ptr.egr_0 */
 	{
-	.description = "rid",
+	.description = "act_rec_ptr",
 	.field_bit_size = 32,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
 	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_RID >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_RID & 0xff}
+	(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
 	},
+	/* class_tid: 4, , table: parif_def_arec_ptr.egr_0 */
 	{
-	.description = "l2_cntxt_tcam_index",
-	.field_bit_size = 10,
+	.description = "act_rec_ptr",
+	.field_bit_size = 32,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
 	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0 >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0 & 0xff}
-	},
-	{
-	.description = "l2_cntxt_id",
-	.field_bit_size = 10,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "src_property_ptr",
-	.field_bit_size = 10,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
 	},
-	/* class_tid: 4, , table: l2_cntxt_tcam.egr_0 */
+	/* class_tid: 4, , table: parif_def_err_arec_ptr.egr_0 */
 	{
-	.description = "l2_cntxt_id",
-	.field_bit_size = 10,
+	.description = "act_rec_ptr",
+	.field_bit_size = 32,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
 	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}
+	(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
 	},
+	/* class_tid: 5, , table: int_encap_custom_record.vfr_egr0 */
 	{
-	.description = "prof_func_id",
-	.field_bit_size = 7,
+	.description = "ecv_valid",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
-	(BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,
-	BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID & 0xff}
+	ULP_WP_SYM_ECV_VALID_YES}
 	},
 	{
-	.description = "l2_byp_lkup_en",
+	.description = "ecv_custom_en",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "parif",
-	.field_bit_size = 4,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
-	(BNXT_ULP_CF_IDX_DRV_FUNC_PARIF >> 8) & 0xff,
-	BNXT_ULP_CF_IDX_DRV_FUNC_PARIF & 0xff}
-	},
-	{
-	.description = "allowed_pri",
-	.field_bit_size = 8,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	ULP_WP_SYM_ECV_CUSTOM_EN_YES}
 	},
 	{
-	.description = "default_pri",
-	.field_bit_size = 3,
+	.description = "ecv_vtag_type",
+	.field_bit_size = 4,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "allowed_tpid",
-	.field_bit_size = 6,
+	.description = "ecv_l2_en",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "default_tpid",
+	.description = "ecv_l3_type",
 	.field_bit_size = 3,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "bd_act_en",
-	.field_bit_size = 1,
+	.description = "ecv_l4_type",
+	.field_bit_size = 3,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "sp_rec_ptr",
-	.field_bit_size = 16,
+	.description = "ecv_tun_type",
+	.field_bit_size = 3,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "byp_sp_lkup",
-	.field_bit_size = 1,
+	.description = "encap_l2_dmac",
+	.field_bit_size = 48,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
-	1}
-	},
-	{
-	.description = "pri_anti_spoof_ctl",
-	.field_bit_size = 2,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "tpid_anti_spoof_ctl",
-	.field_bit_size = 2,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	/* class_tid: 4, , table: l2_cntxt_tcam_cache.egr_wr */
-	{
-	.description = "rid",
-	.field_bit_size = 32,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
-	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_RID >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_RID & 0xff}
+		0x00,
+		0x0a,
+		0xf7,
+		0xaa,
+		0x10,
+		0x02}
 	},
 	{
-	.description = "l2_cntxt_tcam_index",
-	.field_bit_size = 10,
+	.description = "encap_l2_smac",
+	.field_bit_size = 48,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0 >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0 & 0xff}
+		0x00,
+		0x0a,
+		0xf7,
+		0xaa,
+		0x10,
+		0x00}
 	},
 	{
-	.description = "l2_cntxt_id",
-	.field_bit_size = 10,
+	.description = "encap_l2_etype",
+	.field_bit_size = 16,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}
+		0xff,
+		0xff}
 	},
 	{
-	.description = "src_property_ptr",
-	.field_bit_size = 10,
+	.description = "encap_l2_pair_id",
+	.field_bit_size = 16,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	(ULP_WP_SYM_VF_2_VFR_META_VAL >> 8) & 0xff,
+	ULP_WP_SYM_VF_2_VFR_META_VAL & 0xff}
 	},
-	/* class_tid: 4, , table: int_full_act_record.egr_0 */
+	/* class_tid: 5, , table: int_full_act_record.loopback */
 	{
 	.description = "flow_cntr_ptr",
 	.field_bit_size = 14,
@@ -15278,7 +16926,10 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.description = "encap_ptr",
 	.field_bit_size = 11,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_ENCAP_PTR_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_ENCAP_PTR_0 & 0xff}
 	},
 	{
 	.description = "dst_ip_ptr",
@@ -15344,10 +16995,10 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.description = "vnic_or_vport",
 	.field_bit_size = 12,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
-	(BNXT_ULP_CF_IDX_PHY_PORT_VPORT >> 8) & 0xff,
-	BNXT_ULP_CF_IDX_PHY_PORT_VPORT & 0xff}
+	(ULP_WP_SYM_LOOPBACK_PORT >> 8) & 0xff,
+	ULP_WP_SYM_LOOPBACK_PORT & 0xff}
 	},
 	{
 	.description = "pop_vlan",
@@ -15385,197 +17036,348 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 4, , table: parif_def_lkup_arec_ptr.egr_0 */
+	/* class_tid: 5, , table: parif_def_lkup_arec_ptr.vf_egr */
 	{
 	.description = "act_rec_ptr",
 	.field_bit_size = 32,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
 	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
+	(BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR >> 8) & 0xff,
+	BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR & 0xff}
 	},
-	/* class_tid: 4, , table: parif_def_arec_ptr.egr_0 */
+	/* class_tid: 5, , table: parif_def_arec_ptr.vf_egr */
 	{
 	.description = "act_rec_ptr",
 	.field_bit_size = 32,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
 	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
+	(BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR >> 8) & 0xff,
+	BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR & 0xff}
 	},
-	/* class_tid: 4, , table: parif_def_err_arec_ptr.egr_0 */
+	/* class_tid: 5, , table: parif_def_err_arec_ptr.vf_egr */
 	{
 	.description = "act_rec_ptr",
 	.field_bit_size = 32,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
+	.field_opr1 = {
+	(BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR >> 8) & 0xff,
+	BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR & 0xff}
+	},
+	/* class_tid: 5, , table: l2_cntxt_tcam.vf_vfr_ing */
+	{
+	.description = "l2_cntxt_id",
+	.field_bit_size = 10,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
 	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
+	(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}
 	},
-	/* class_tid: 5, , table: int_full_act_record.loopback */
 	{
-	.description = "flow_cntr_ptr",
-	.field_bit_size = 14,
+	.description = "prof_func_id",
+	.field_bit_size = 7,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
+	.field_opr1 = {
+	(BNXT_ULP_GLB_RF_IDX_VF_2_VFR_PROF_FUNC_ID >> 8) & 0xff,
+	BNXT_ULP_GLB_RF_IDX_VF_2_VFR_PROF_FUNC_ID & 0xff}
+	},
+	{
+	.description = "l2_byp_lkup_en",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "age_enable",
+	.description = "parif",
+	.field_bit_size = 4,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "allowed_pri",
+	.field_bit_size = 8,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "default_pri",
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "allowed_tpid",
+	.field_bit_size = 6,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "default_tpid",
+	.field_bit_size = 3,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "bd_act_en",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "agg_cntr_en",
+	.description = "sp_rec_ptr",
+	.field_bit_size = 16,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "byp_sp_lkup",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	1}
+	},
+	{
+	.description = "pri_anti_spoof_ctl",
+	.field_bit_size = 2,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "rate_cntr_en",
+	.description = "tpid_anti_spoof_ctl",
+	.field_bit_size = 2,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	/* class_tid: 5, , table: profile_tcam.vf_vfr_ing */
+	{
+	.description = "wc_key_id",
+	.field_bit_size = 4,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "wc_profile_id",
+	.field_bit_size = 8,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "wc_search_en",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "flow_cntr_en",
+	.description = "em_key_mask.0",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tcpflags_key",
-	.field_bit_size = 8,
+	.description = "em_key_mask.1",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	1}
+	},
+	{
+	.description = "em_key_mask.2",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tcpflags_mir",
+	.description = "em_key_mask.3",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tcpflags_match",
+	.description = "em_key_mask.4",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "encap_ptr",
-	.field_bit_size = 11,
+	.description = "em_key_mask.5",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "dst_ip_ptr",
-	.field_bit_size = 10,
+	.description = "em_key_mask.6",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tcp_dst_port",
-	.field_bit_size = 16,
+	.description = "em_key_mask.7",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "src_ip_ptr",
-	.field_bit_size = 10,
+	.description = "em_key_mask.8",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tcp_src_port",
-	.field_bit_size = 16,
+	.description = "em_key_mask.9",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "meter_id",
-	.field_bit_size = 10,
+	.description = "em_key_id",
+	.field_bit_size = 5,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "l3_rdir",
+	.description = "em_profile_id",
+	.field_bit_size = 8,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
+	.field_opr1 = {
+	(BNXT_ULP_GLB_RF_IDX_GLB_VFR_EM_PROF_ID_0 >> 8) & 0xff,
+	BNXT_ULP_GLB_RF_IDX_GLB_VFR_EM_PROF_ID_0 & 0xff}
+	},
+	{
+	.description = "em_search_en",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	1}
+	},
+	{
+	.description = "pl_byp_lkup_en",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
+	/* class_tid: 5, , table: profile_tcam.any_vf_ing */
 	{
-	.description = "tl3_rdir",
+	.description = "wc_key_id",
+	.field_bit_size = 4,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "wc_profile_id",
+	.field_bit_size = 8,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "wc_search_en",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "l3_ttl_dec",
+	.description = "em_key_mask.0",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tl3_ttl_dec",
+	.description = "em_key_mask.1",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "decap_func",
-	.field_bit_size = 4,
+	.description = "em_key_mask.2",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "vnic_or_vport",
-	.field_bit_size = 12,
+	.description = "em_key_mask.3",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "em_key_mask.4",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
-	(ULP_WP_SYM_LOOPBACK_PORT >> 8) & 0xff,
-	ULP_WP_SYM_LOOPBACK_PORT & 0xff}
+	1}
 	},
 	{
-	.description = "pop_vlan",
+	.description = "em_key_mask.5",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "meter",
+	.description = "em_key_mask.6",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "mirror",
-	.field_bit_size = 2,
+	.description = "em_key_mask.7",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "drop",
+	.description = "em_key_mask.8",
+	.field_bit_size = 1,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	},
+	{
+	.description = "em_key_mask.9",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	1}
+	},
+	{
+	.description = "em_key_id",
+	.field_bit_size = 5,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	14}
+	},
+	{
+	.description = "em_profile_id",
+	.field_bit_size = 8,
+	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
+	.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
+	.field_opr1 = {
+	(BNXT_ULP_GLB_RF_IDX_GLB_VFR_EM_PROF_ID_1 >> 8) & 0xff,
+	BNXT_ULP_GLB_RF_IDX_GLB_VFR_EM_PROF_ID_1 & 0xff}
 	},
 	{
-	.description = "hit",
+	.description = "em_search_en",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	1}
 	},
 	{
-	.description = "type",
+	.description = "pl_byp_lkup_en",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 5, , table: l2_cntxt_tcam.vf_egr */
+	/* class_tid: 5, , table: l2_cntxt_tcam.vfr_vf_ing */
 	{
 	.description = "l2_cntxt_id",
 	.field_bit_size = 10,
@@ -15591,8 +17393,8 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
 	.field_opr1 = {
-	(BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,
-	BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID & 0xff}
+	(BNXT_ULP_GLB_RF_IDX_ANY_2_VF_PROF_FUNC_ID >> 8) & 0xff,
+	BNXT_ULP_GLB_RF_IDX_ANY_2_VF_PROF_FUNC_ID & 0xff}
 	},
 	{
 	.description = "l2_byp_lkup_en",
@@ -15604,9 +17406,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.description = "parif",
 	.field_bit_size = 4,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-	ULP_WP_SYM_LOOPBACK_PARIF}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "allowed_pri",
@@ -15664,7 +17464,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 5, , table: l2_cntxt_tcam_cache.vf_egr_wr */
+	/* class_tid: 5, , table: profile_tcam_cache.vfr_glb_act_rec_wr */
 	{
 	.description = "rid",
 	.field_bit_size = 32,
@@ -15675,443 +17475,393 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	BNXT_ULP_RF_IDX_RID & 0xff}
 	},
 	{
-	.description = "l2_cntxt_tcam_index",
-	.field_bit_size = 10,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
-	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0 >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0 & 0xff}
-	},
-	{
-	.description = "l2_cntxt_id",
-	.field_bit_size = 10,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
-	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}
-	},
-	{
-	.description = "src_property_ptr",
+	.description = "profile_tcam_index",
 	.field_bit_size = 10,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 5, , table: parif_def_lkup_arec_ptr.vf_egr */
-	{
-	.description = "act_rec_ptr",
-	.field_bit_size = 32,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
-	.field_opr1 = {
-	(BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR >> 8) & 0xff,
-	BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR & 0xff}
-	},
-	/* class_tid: 5, , table: parif_def_arec_ptr.vf_egr */
-	{
-	.description = "act_rec_ptr",
-	.field_bit_size = 32,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
-	.field_opr1 = {
-	(BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR >> 8) & 0xff,
-	BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR & 0xff}
-	},
-	/* class_tid: 5, , table: parif_def_err_arec_ptr.vf_egr */
 	{
-	.description = "act_rec_ptr",
-	.field_bit_size = 32,
+	.description = "em_profile_id",
+	.field_bit_size = 8,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
-	.field_opr1 = {
-	(BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR >> 8) & 0xff,
-	BNXT_ULP_GLB_RF_IDX_GLB_LB_AREC_PTR & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 5, , table: int_full_act_record.vf_ing */
 	{
-	.description = "flow_cntr_ptr",
-	.field_bit_size = 14,
+	.description = "wc_profile_id",
+	.field_bit_size = 8,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "age_enable",
-	.field_bit_size = 1,
+	.description = "flow_sig_id",
+	.field_bit_size = 64,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
+	/* class_tid: 5, , table: sp_smac_ipv4.0 */
 	{
-	.description = "agg_cntr_en",
-	.field_bit_size = 1,
+	.description = "smac",
+	.field_bit_size = 48,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "rate_cntr_en",
-	.field_bit_size = 1,
+	.description = "ipv4_src_addr",
+	.field_bit_size = 32,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
+	/* class_tid: 5, , table: sp_smac_ipv6.0 */
 	{
-	.description = "flow_cntr_en",
-	.field_bit_size = 1,
+	.description = "smac",
+	.field_bit_size = 48,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tcpflags_key",
-	.field_bit_size = 8,
+	.description = "ipv6_src_addr",
+	.field_bit_size = 128,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
+	/* class_tid: 5, , table: l2_cntxt_tcam.vf_egr */
 	{
-	.description = "tcpflags_mir",
-	.field_bit_size = 1,
+	.description = "l2_cntxt_id",
+	.field_bit_size = 10,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}
 	},
 	{
-	.description = "tcpflags_match",
-	.field_bit_size = 1,
+	.description = "prof_func_id",
+	.field_bit_size = 7,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_GLB_RF,
+	.field_opr1 = {
+	(BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID >> 8) & 0xff,
+	BNXT_ULP_GLB_RF_IDX_GLB_PROF_FUNC_ID & 0xff}
 	},
 	{
-	.description = "encap_ptr",
-	.field_bit_size = 11,
+	.description = "l2_byp_lkup_en",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "dst_ip_ptr",
-	.field_bit_size = 10,
+	.description = "parif",
+	.field_bit_size = 4,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	ULP_WP_SYM_LOOPBACK_PARIF}
 	},
 	{
-	.description = "tcp_dst_port",
-	.field_bit_size = 16,
+	.description = "allowed_pri",
+	.field_bit_size = 8,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "src_ip_ptr",
-	.field_bit_size = 10,
+	.description = "default_pri",
+	.field_bit_size = 3,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tcp_src_port",
-	.field_bit_size = 16,
+	.description = "allowed_tpid",
+	.field_bit_size = 6,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "meter_id",
-	.field_bit_size = 10,
+	.description = "default_tpid",
+	.field_bit_size = 3,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "l3_rdir",
+	.description = "bd_act_en",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tl3_rdir",
-	.field_bit_size = 1,
+	.description = "sp_rec_ptr",
+	.field_bit_size = 16,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_RF_4 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_RF_4 & 0xff}
 	},
 	{
-	.description = "l3_ttl_dec",
+	.description = "byp_sp_lkup",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	1}
 	},
 	{
-	.description = "tl3_ttl_dec",
-	.field_bit_size = 1,
+	.description = "pri_anti_spoof_ctl",
+	.field_bit_size = 2,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "decap_func",
-	.field_bit_size = 4,
+	.description = "tpid_anti_spoof_ctl",
+	.field_bit_size = 2,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
+	/* class_tid: 5, , table: int_full_act_record.vf_vfr_ing */
 	{
-	.description = "vnic_or_vport",
-	.field_bit_size = 12,
+	.description = "flow_cntr_ptr",
+	.field_bit_size = 14,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
-	.field_opr1 = {
-	(BNXT_ULP_CF_IDX_DRV_FUNC_VNIC >> 8) & 0xff,
-	BNXT_ULP_CF_IDX_DRV_FUNC_VNIC & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "pop_vlan",
+	.description = "age_enable",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "meter",
+	.description = "agg_cntr_en",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "mirror",
-	.field_bit_size = 2,
+	.description = "rate_cntr_en",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "drop",
+	.description = "flow_cntr_en",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "hit",
-	.field_bit_size = 1,
+	.description = "tcpflags_key",
+	.field_bit_size = 8,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "type",
+	.description = "tcpflags_mir",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 5, , table: l2_cntxt_tcam_bypass.vf_ing */
-	{
-	.description = "act_record_ptr",
-	.field_bit_size = 16,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
-	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
-	},
 	{
-	.description = "reserved",
+	.description = "tcpflags_match",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "l2_byp_lkup_en",
-	.field_bit_size = 1,
+	.description = "encap_ptr",
+	.field_bit_size = 11,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-	1}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "parif",
-	.field_bit_size = 4,
+	.description = "dst_ip_ptr",
+	.field_bit_size = 10,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "allowed_pri",
-	.field_bit_size = 8,
+	.description = "tcp_dst_port",
+	.field_bit_size = 16,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "default_pri",
-	.field_bit_size = 3,
+	.description = "src_ip_ptr",
+	.field_bit_size = 10,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "allowed_tpid",
-	.field_bit_size = 6,
+	.description = "tcp_src_port",
+	.field_bit_size = 16,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "default_tpid",
-	.field_bit_size = 3,
+	.description = "meter_id",
+	.field_bit_size = 10,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "bd_act_en",
+	.description = "l3_rdir",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "sp_rec_ptr",
-	.field_bit_size = 16,
+	.description = "tl3_rdir",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "byp_sp_lkup",
+	.description = "l3_ttl_dec",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-	1}
-	},
-	{
-	.description = "pri_anti_spoof_ctl",
-	.field_bit_size = 2,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tpid_anti_spoof_ctl",
-	.field_bit_size = 2,
+	.description = "tl3_ttl_dec",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 5, , table: l2_cntxt_tcam_bypass.vfr_egr0 */
 	{
-	.description = "act_record_ptr",
-	.field_bit_size = 16,
+	.description = "decap_func",
+	.field_bit_size = 4,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	ULP_WP_SYM_DECAP_FUNC_THRU_TUN}
 	},
 	{
-	.description = "reserved",
-	.field_bit_size = 1,
+	.description = "vnic_or_vport",
+	.field_bit_size = 12,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
+	.field_opr1 = {
+	(BNXT_ULP_CF_IDX_DRV_FUNC_VNIC >> 8) & 0xff,
+	BNXT_ULP_CF_IDX_DRV_FUNC_VNIC & 0xff}
 	},
 	{
-	.description = "l2_byp_lkup_en",
+	.description = "pop_vlan",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-	1}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "parif",
-	.field_bit_size = 4,
+	.description = "meter",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "allowed_pri",
-	.field_bit_size = 8,
+	.description = "mirror",
+	.field_bit_size = 2,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "default_pri",
-	.field_bit_size = 3,
+	.description = "drop",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "allowed_tpid",
-	.field_bit_size = 6,
+	.description = "hit",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "default_tpid",
-	.field_bit_size = 3,
+	.description = "type",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
+	/* class_tid: 5, , table: em.vfr */
 	{
-	.description = "bd_act_en",
-	.field_bit_size = 1,
+	.description = "act_rec_ptr",
+	.field_bit_size = 33,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
 	.field_opr1 = {
-	1}
+	(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
 	},
 	{
-	.description = "sp_rec_ptr",
-	.field_bit_size = 16,
+	.description = "ext_flow_cntr",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "byp_sp_lkup",
+	.description = "act_rec_int",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-	1}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "pri_anti_spoof_ctl",
-	.field_bit_size = 2,
+	.description = "act_rec_size",
+	.field_bit_size = 5,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "tpid_anti_spoof_ctl",
-	.field_bit_size = 2,
+	.description = "key_size",
+	.field_bit_size = 9,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 5, , table: l2_cntxt_tcam_cache.vfr_wr_egr0 */
 	{
-	.description = "rid",
-	.field_bit_size = 32,
+	.description = "reserved",
+	.field_bit_size = 11,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
-	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_RID >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_RID & 0xff}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "l2_cntxt_tcam_index",
-	.field_bit_size = 10,
+	.description = "strength",
+	.field_bit_size = 2,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0 >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_L2_CNTXT_TCAM_INDEX_0 & 0xff}
+	3}
 	},
 	{
-	.description = "l2_cntxt_id",
-	.field_bit_size = 10,
+	.description = "l1_cacheable",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "src_property_ptr",
-	.field_bit_size = 10,
+	.description = "valid",
+	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	1}
 	},
-	/* class_tid: 5, , table: int_vtag_encap_record.vfr_egr0 */
+	/* class_tid: 5, , table: int_encap_custom_record.vfr_vf_egr0 */
 	{
 	.description = "ecv_valid",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
-	1}
+	ULP_WP_SYM_ECV_VALID_YES}
 	},
 	{
 	.description = "ecv_custom_en",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	ULP_WP_SYM_ECV_CUSTOM_EN_YES}
 	},
 	{
 	.description = "ecv_vtag_type",
 	.field_bit_size = 4,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-	ULP_WP_SYM_ECV_VTAG_TYPE_ADD_1_ENCAP_PRI}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "ecv_l2_en",
@@ -16138,34 +17888,48 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "vtag_tpid",
-	.field_bit_size = 16,
+	.description = "encap_l2_dmac",
+	.field_bit_size = 48,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
-		0x81,
-		0x00}
+		0x00,
+		0x0a,
+		0xf7,
+		0xaa,
+		0x10,
+		0x01}
 	},
 	{
-	.description = "vtag_pcp",
-	.field_bit_size = 3,
+	.description = "encap_l2_smac",
+	.field_bit_size = 48,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+		0x00,
+		0x0a,
+		0xf7,
+		0xaa,
+		0x10,
+		0x00}
 	},
 	{
-	.description = "vtag_de",
-	.field_bit_size = 1,
+	.description = "encap_l2_etype",
+	.field_bit_size = 16,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+		0xff,
+		0xff}
 	},
 	{
-	.description = "vtag_vid",
-	.field_bit_size = 12,
+	.description = "encap_l2_pair_id",
+	.field_bit_size = 16,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_CF,
 	.field_opr1 = {
-	(BNXT_ULP_CF_IDX_DEV_PORT_ID >> 8) & 0xff,
-	BNXT_ULP_CF_IDX_DEV_PORT_ID & 0xff}
+	(BNXT_ULP_CF_IDX_VF_META_FID >> 8) & 0xff,
+	BNXT_ULP_CF_IDX_VF_META_FID & 0xff}
 	},
 	/* class_tid: 5, , table: int_full_act_record.vfr_egr0 */
 	{
@@ -16443,7 +18207,9 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.description = "decap_func",
 	.field_bit_size = 4,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	ULP_WP_SYM_DECAP_FUNC_THRU_TUN}
 	},
 	{
 	.description = "vnic_or_vport",
@@ -16458,9 +18224,7 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.description = "pop_vlan",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-	1}
+	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
 	.description = "meter",
@@ -16492,10 +18256,10 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
-	/* class_tid: 5, , table: l2_cntxt_tcam_bypass.vfr_dtagged_ing0 */
+	/* class_tid: 5, , table: em.any_vf */
 	{
-	.description = "act_record_ptr",
-	.field_bit_size = 16,
+	.description = "act_rec_ptr",
+	.field_bit_size = 33,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
 	.field_opr1 = {
@@ -16503,166 +18267,114 @@ struct bnxt_ulp_mapper_field_info ulp_wh_plus_class_result_field_list[] = {
 	BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
 	},
 	{
-	.description = "reserved",
+	.description = "ext_flow_cntr",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "l2_byp_lkup_en",
+	.description = "act_rec_int",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-	1}
-	},
-	{
-	.description = "parif",
-	.field_bit_size = 4,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "allowed_pri",
-	.field_bit_size = 8,
+	.description = "act_rec_size",
+	.field_bit_size = 5,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "default_pri",
-	.field_bit_size = 3,
+	.description = "key_size",
+	.field_bit_size = 9,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "allowed_tpid",
-	.field_bit_size = 6,
+	.description = "reserved",
+	.field_bit_size = 11,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "default_tpid",
-	.field_bit_size = 3,
+	.description = "strength",
+	.field_bit_size = 2,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_opr1 = {
+	3}
 	},
 	{
-	.description = "bd_act_en",
+	.description = "l1_cacheable",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "sp_rec_ptr",
-	.field_bit_size = 16,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "byp_sp_lkup",
+	.description = "valid",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
 	.field_opr1 = {
 	1}
 	},
+	/* class_tid: 5, , table: port_table.vfr_wr */
 	{
-	.description = "pri_anti_spoof_ctl",
-	.field_bit_size = 2,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "tpid_anti_spoof_ctl",
-	.field_bit_size = 2,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	/* class_tid: 5, , table: l2_cntxt_tcam_bypass.vfr_stagged_ing0 */
-	{
-	.description = "act_record_ptr",
-	.field_bit_size = 16,
+	.description = "rid",
+	.field_bit_size = 32,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
 	.field_opr1 = {
-	(BNXT_ULP_RF_IDX_MAIN_ACTION_PTR >> 8) & 0xff,
-	BNXT_ULP_RF_IDX_MAIN_ACTION_PTR & 0xff}
+	(BNXT_ULP_RF_IDX_RID >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_RID & 0xff}
 	},
 	{
-	.description = "reserved",
-	.field_bit_size = 1,
+	.description = "drv_func.mac",
+	.field_bit_size = 48,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "l2_byp_lkup_en",
-	.field_bit_size = 1,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
-	.field_opr1 = {
-	1}
-	},
-	{
-	.description = "parif",
-	.field_bit_size = 4,
+	.description = "drv_func.parent.mac",
+	.field_bit_size = 48,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "allowed_pri",
+	.description = "phy_port",
 	.field_bit_size = 8,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "default_pri",
-	.field_bit_size = 3,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "allowed_tpid",
-	.field_bit_size = 6,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "default_tpid",
-	.field_bit_size = 3,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
-	},
-	{
-	.description = "bd_act_en",
+	.description = "port_is_pf",
 	.field_bit_size = 1,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "sp_rec_ptr",
+	.description = "default_arec_ptr",
 	.field_bit_size = 16,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
 	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
 	},
 	{
-	.description = "byp_sp_lkup",
-	.field_bit_size = 1,
+	.description = "l2_cntxt_id",
+	.field_bit_size = 10,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_CONST,
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
 	.field_opr1 = {
-	1}
-	},
-	{
-	.description = "pri_anti_spoof_ctl",
-	.field_bit_size = 2,
-	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	(BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_L2_CNTXT_ID_0 & 0xff}
 	},
 	{
-	.description = "tpid_anti_spoof_ctl",
-	.field_bit_size = 2,
+	.description = "sp_rec_ptr",
+	.field_bit_size = 16,
 	.field_opc = BNXT_ULP_FIELD_OPC_SRC1,
-	.field_src1 = BNXT_ULP_FIELD_SRC_ZERO
+	.field_src1 = BNXT_ULP_FIELD_SRC_RF,
+	.field_opr1 = {
+	(BNXT_ULP_RF_IDX_RF_4 >> 8) & 0xff,
+	BNXT_ULP_RF_IDX_RF_4 & 0xff}
 	}
 };
 
@@ -16778,12 +18490,12 @@ struct bnxt_ulp_mapper_ident_info ulp_wh_plus_class_ident_list[] = {
 	.ident_bit_size = 10,
 	.ident_bit_pos = 32
 	},
-	/* class_tid: 3, , table: l2_cntxt_tcam_cache.rd */
+	/* class_tid: 3, , table: port_table.rd */
 	{
 	.description = "l2_cntxt_id",
 	.regfile_idx = BNXT_ULP_RF_IDX_L2_CNTXT_ID_0,
 	.ident_bit_size = 10,
-	.ident_bit_pos = 42
+	.ident_bit_pos = 153
 	},
 	/* class_tid: 3, , table: mac_addr_cache.rd */
 	{
@@ -16856,6 +18568,31 @@ struct bnxt_ulp_mapper_ident_info ulp_wh_plus_class_ident_list[] = {
 	.ident_bit_size = 10,
 	.ident_bit_pos = 0
 	},
+	/* class_tid: 5, , table: l2_cntxt_tcam.vf_vfr_ing */
+	{
+	.description = "l2_cntxt_id",
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+	.ident_type = TF_IDENT_TYPE_L2_CTXT_HIGH,
+	.regfile_idx = BNXT_ULP_RF_IDX_L2_CNTXT_ID_0,
+	.ident_bit_size = 10,
+	.ident_bit_pos = 0
+	},
+	/* class_tid: 5, , table: l2_cntxt_tcam.vfr_vf_ing */
+	{
+	.description = "l2_cntxt_id",
+	.resource_func = BNXT_ULP_RESOURCE_FUNC_IDENTIFIER,
+	.ident_type = TF_IDENT_TYPE_L2_CTXT_HIGH,
+	.regfile_idx = BNXT_ULP_RF_IDX_L2_CNTXT_ID_0,
+	.ident_bit_size = 10,
+	.ident_bit_pos = 0
+	},
+	/* class_tid: 5, , table: port_table.vfr_rd */
+	{
+	.description = "l2_cntxt_id",
+	.regfile_idx = BNXT_ULP_RF_IDX_L2_CNTXT_ID_0,
+	.ident_bit_size = 10,
+	.ident_bit_pos = 153
+	},
 	/* class_tid: 5, , table: l2_cntxt_tcam.vf_egr */
 	{
 	.description = "l2_cntxt_id_low",
@@ -16866,3 +18603,4 @@ struct bnxt_ulp_mapper_ident_info ulp_wh_plus_class_ident_list[] = {
 	.ident_bit_pos = 0
 	}
 };
+
diff --git a/drivers/net/bnxt/tf_ulp/ulp_mapper.c b/drivers/net/bnxt/tf_ulp/ulp_mapper.c
index 1e95905e21..ea1311c0c4 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_mapper.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_mapper.c
@@ -769,7 +769,7 @@ ulp_mapper_priority_opc_process(struct bnxt_ulp_mapper_parms *parms,
 
 	switch (tbl->pri_opcode) {
 	case BNXT_ULP_PRI_OPC_NOT_USED:
-		*priority = 0;
+		*priority = bnxt_ulp_default_app_priority_get(parms->ulp_ctx);
 		break;
 	case BNXT_ULP_PRI_OPC_CONST:
 		*priority = tbl->pri_operand;
@@ -3303,6 +3303,11 @@ ulp_mapper_global_res_free(struct bnxt_ulp_context *ulp __rte_unused,
 		rc = bnxt_pmd_global_tunnel_set(port_id, ttype, dport,
 						&handle);
 		break;
+	case BNXT_ULP_RESOURCE_SUB_TYPE_GLOBAL_REGISTER_CUST_VXLAN_GPE:
+		ttype = BNXT_GLOBAL_REGISTER_TUNNEL_VXLAN_GPE;
+		rc = bnxt_pmd_global_tunnel_set(port_id, ttype, dport,
+						&handle);
+		break;
 	default:
 		rc = -EINVAL;
 		BNXT_TF_DBG(ERR, "Invalid ulp global resource type %d\n",
@@ -3355,31 +3360,14 @@ ulp_mapper_global_register_tbl_process(struct bnxt_ulp_mapper_parms *parms,
 
 	switch (tbl->resource_sub_type) {
 	case BNXT_ULP_RESOURCE_SUB_TYPE_GLOBAL_REGISTER_CUST_VXLAN:
-		tmp_data = ulp_blob_data_get(&data, &data_len);
-		udp_port = *((uint16_t *)tmp_data);
-		udp_port = tfp_be_to_cpu_16(udp_port);
 		ttype = BNXT_GLOBAL_REGISTER_TUNNEL_VXLAN;
-
-		rc = bnxt_pmd_global_tunnel_set(parms->port_id, ttype,
-						udp_port, &handle);
-		if (rc) {
-			BNXT_TF_DBG(ERR, "Unable to set VXLAN UDP port\n");
-			return rc;
-		}
 		break;
 	case BNXT_ULP_RESOURCE_SUB_TYPE_GLOBAL_REGISTER_CUST_ECPRI:
-		tmp_data = ulp_blob_data_get(&data, &data_len);
-		udp_port = *((uint16_t *)tmp_data);
-		udp_port = tfp_be_to_cpu_16(udp_port);
 		ttype = BNXT_GLOBAL_REGISTER_TUNNEL_ECPRI;
-
-		rc = bnxt_pmd_global_tunnel_set(parms->port_id, ttype,
-						udp_port, &handle);
-		if (rc) {
-			BNXT_TF_DBG(ERR, "Unable to set eCPRI UDP port\n");
-			return rc;
-		}
-	break;
+		break;
+	case BNXT_ULP_RESOURCE_SUB_TYPE_GLOBAL_REGISTER_CUST_VXLAN_GPE:
+		ttype = BNXT_GLOBAL_REGISTER_TUNNEL_VXLAN_GPE;
+		break;
 	default:
 		rc = -EINVAL;
 		BNXT_TF_DBG(ERR, "Invalid ulp global resource type %d\n",
@@ -3387,6 +3375,16 @@ ulp_mapper_global_register_tbl_process(struct bnxt_ulp_mapper_parms *parms,
 		return rc;
 	}
 
+	tmp_data = ulp_blob_data_get(&data, &data_len);
+	udp_port = *((uint16_t *)tmp_data);
+	udp_port = tfp_be_to_cpu_16(udp_port);
+
+	rc = bnxt_pmd_global_tunnel_set(parms->port_id, ttype, udp_port, &handle);
+	if (rc) {
+		BNXT_TF_DBG(ERR, "Unable to set Type %d port\n", ttype);
+		return rc;
+	}
+
 	/* Set the common pieces of fid parms */
 	fid_parms.direction = tbl->direction;
 	fid_parms.resource_func	= tbl->resource_func;
diff --git a/drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c b/drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c
index 51b2e98103..6660e5db05 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c
@@ -329,8 +329,8 @@ struct bnxt_ulp_rte_hdr_info ulp_hdr_info[] = {
 	.proto_hdr_func          = NULL
 	},
 	[RTE_FLOW_ITEM_TYPE_VXLAN_GPE] = {
-	.hdr_type                = BNXT_ULP_HDR_TYPE_NOT_SUPPORTED,
-	.proto_hdr_func          = NULL
+	.hdr_type                = BNXT_ULP_HDR_TYPE_SUPPORTED,
+	.proto_hdr_func          = ulp_rte_vxlan_gpe_hdr_handler
 	},
 	[RTE_FLOW_ITEM_TYPE_ARP_ETH_IPV4] = {
 	.hdr_type                = BNXT_ULP_HDR_TYPE_NOT_SUPPORTED,
diff --git a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c
index 0937d0dbe4..013d8b0a59 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c
@@ -24,7 +24,9 @@
 #define ULP_VLAN_PRIORITY_MASK		0x700
 #define ULP_VLAN_TAG_MASK		0xFFF /* Last 12 bits*/
 #define ULP_UDP_PORT_VXLAN		4789
-#define ULP_UDP_PORT_VXLAN_MASK	 0XFFFF
+#define ULP_UDP_PORT_VXLAN_MASK		0xFFFF
+#define ULP_UDP_PORT_VXLAN_GPE		4790
+#define ULP_UDP_PORT_VXLAN_GPE_MASK	0xFFFF
 
 /* Utility function to skip the void items. */
 static inline int32_t
@@ -1273,6 +1275,13 @@ ulp_rte_l4_proto_type_update(struct ulp_rte_parser_params *params,
 			       BNXT_ULP_HDR_BIT_T_VXLAN);
 		ULP_COMP_FLD_IDX_WR(params, BNXT_ULP_CF_IDX_L3_TUN, 1);
 	}
+
+	if (hdr_bit == BNXT_ULP_HDR_BIT_O_UDP && dst_port ==
+	    tfp_cpu_to_be_16(ULP_UDP_PORT_VXLAN_GPE)) {
+		ULP_BITMAP_SET(params->hdr_fp_bit.bits,
+			       BNXT_ULP_HDR_BIT_T_VXLAN_GPE);
+		ULP_COMP_FLD_IDX_WR(params, BNXT_ULP_CF_IDX_L3_TUN, 1);
+	}
 }
 
 /* Function to handle the parsing of RTE Flow item UDP Header. */
@@ -1518,6 +1527,73 @@ ulp_rte_vxlan_hdr_handler(const struct rte_flow_item *item,
 	return BNXT_TF_RC_SUCCESS;
 }
 
+/* Function to handle the parsing of RTE Flow item Vxlan GPE Header. */
+int32_t
+ulp_rte_vxlan_gpe_hdr_handler(const struct rte_flow_item *item,
+			      struct ulp_rte_parser_params *params)
+{
+	const struct rte_flow_item_vxlan_gpe *vxlan_gpe_spec = item->spec;
+	const struct rte_flow_item_vxlan_gpe *vxlan_gpe_mask = item->mask;
+	struct ulp_rte_hdr_bitmap *hdr_bitmap = &params->hdr_bitmap;
+	uint32_t idx = 0;
+	uint16_t dport;
+	uint32_t size;
+
+	if (ulp_rte_prsr_fld_size_validate(params, &idx,
+					   BNXT_ULP_PROTO_HDR_VXLAN_GPE_NUM)) {
+		BNXT_TF_DBG(ERR, "Error parsing protocol header\n");
+		return BNXT_TF_RC_ERROR;
+	}
+
+	/*
+	 * Copy the rte_flow_item for vxlan gpe into hdr_field using vxlan
+	 * header fields
+	 */
+	size = sizeof(((struct rte_flow_item_vxlan_gpe *)NULL)->flags);
+	ulp_rte_prsr_fld_mask(params, &idx, size,
+			      ulp_deference_struct(vxlan_gpe_spec, flags),
+			      ulp_deference_struct(vxlan_gpe_mask, flags),
+			      ULP_PRSR_ACT_DEFAULT);
+
+	size = sizeof(((struct rte_flow_item_vxlan_gpe *)NULL)->rsvd0);
+	ulp_rte_prsr_fld_mask(params, &idx, size,
+			      ulp_deference_struct(vxlan_gpe_spec, rsvd0),
+			      ulp_deference_struct(vxlan_gpe_mask, rsvd0),
+			      ULP_PRSR_ACT_DEFAULT);
+
+	size = sizeof(((struct rte_flow_item_vxlan_gpe *)NULL)->protocol);
+	ulp_rte_prsr_fld_mask(params, &idx, size,
+			      ulp_deference_struct(vxlan_gpe_spec, protocol),
+			      ulp_deference_struct(vxlan_gpe_mask, protocol),
+			      ULP_PRSR_ACT_DEFAULT);
+
+	size = sizeof(((struct rte_flow_item_vxlan_gpe *)NULL)->vni);
+	ulp_rte_prsr_fld_mask(params, &idx, size,
+			      ulp_deference_struct(vxlan_gpe_spec, vni),
+			      ulp_deference_struct(vxlan_gpe_mask, vni),
+			      ULP_PRSR_ACT_DEFAULT);
+
+	size = sizeof(((struct rte_flow_item_vxlan_gpe *)NULL)->rsvd1);
+	ulp_rte_prsr_fld_mask(params, &idx, size,
+			      ulp_deference_struct(vxlan_gpe_spec, rsvd1),
+			      ulp_deference_struct(vxlan_gpe_mask, rsvd1),
+			      ULP_PRSR_ACT_DEFAULT);
+
+	/* Update the hdr_bitmap with vxlan gpe*/
+	ULP_BITMAP_SET(hdr_bitmap->bits, BNXT_ULP_HDR_BIT_T_VXLAN_GPE);
+	ULP_COMP_FLD_IDX_WR(params, BNXT_ULP_CF_IDX_L3_TUN, 1);
+
+	dport = ULP_COMP_FLD_IDX_RD(params, BNXT_ULP_CF_IDX_O_L4_DST_PORT);
+	if (!dport) {
+		ULP_COMP_FLD_IDX_WR(params, BNXT_ULP_CF_IDX_O_L4_DST_PORT,
+				    ULP_UDP_PORT_VXLAN_GPE);
+		ULP_COMP_FLD_IDX_WR(params, BNXT_ULP_CF_IDX_O_L4_DST_PORT_MASK,
+				    ULP_UDP_PORT_VXLAN_GPE_MASK);
+	}
+
+	return BNXT_TF_RC_SUCCESS;
+}
+
 /* Function to handle the parsing of RTE Flow item GRE Header. */
 int32_t
 ulp_rte_gre_hdr_handler(const struct rte_flow_item *item,
diff --git a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.h b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.h
index 9dd7ebcb76..af6e736825 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.h
+++ b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.h
@@ -130,6 +130,11 @@ int32_t
 ulp_rte_vxlan_hdr_handler(const struct rte_flow_item *item,
 			  struct ulp_rte_parser_params *params);
 
+/* Function to handle the parsing of RTE Flow item Vxlan GPE Header. */
+int32_t
+ulp_rte_vxlan_gpe_hdr_handler(const struct rte_flow_item *item,
+			      struct ulp_rte_parser_params *params);
+
 /* Function to handle the parsing of RTE Flow item GRE Header. */
 int32_t
 ulp_rte_gre_hdr_handler(const struct rte_flow_item *item,
diff --git a/drivers/net/bnxt/tf_ulp/ulp_template_struct.h b/drivers/net/bnxt/tf_ulp/ulp_template_struct.h
index 9e11b3e305..becbb73655 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_template_struct.h
+++ b/drivers/net/bnxt/tf_ulp/ulp_template_struct.h
@@ -27,6 +27,7 @@
 #define BNXT_ULP_PROTO_HDR_UDP_NUM	4
 #define BNXT_ULP_PROTO_HDR_TCP_NUM	9
 #define BNXT_ULP_PROTO_HDR_VXLAN_NUM	4
+#define BNXT_ULP_PROTO_HDR_VXLAN_GPE_NUM 5
 #define BNXT_ULP_PROTO_HDR_GRE_NUM	2
 #define BNXT_ULP_PROTO_HDR_ICMP_NUM	5
 #define BNXT_ULP_PROTO_HDR_ECPRI_NUM	2
@@ -363,6 +364,7 @@ struct bnxt_ulp_resource_resv_info {
 
 struct bnxt_ulp_app_capabilities_info {
 	uint8_t				app_id;
+	uint32_t			default_priority;
 	uint32_t			vxlan_port;
 	uint32_t			vxlan_ip_port;
 	uint32_t			ecpri_udp_port;
-- 
2.39.3


  parent reply	other threads:[~2024-08-30 14:03 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-30 14:00 [PATCH 00/47] TruFlow update for Thor2 Sriharsha Basavapatna
2024-08-30 14:00 ` [PATCH 01/47] net/bnxt: tf_core: fix wc tcam multi slice delete issue Sriharsha Basavapatna
2024-08-30 14:00 ` [PATCH 02/47] net/bnxt: tf_core: tcam manager data corruption Sriharsha Basavapatna
2024-08-30 14:00 ` [PATCH 03/47] net/bnxt: tf_core: External EM support cleanup Sriharsha Basavapatna
2024-08-30 14:00 ` [PATCH 04/47] net/bnxt: tf_core: Thor TF EM key size check Sriharsha Basavapatna
2024-08-30 14:00 ` [PATCH 05/47] net/bnxt: tf_core: flow scale improvement Sriharsha Basavapatna
2024-08-30 14:00 ` [PATCH 06/47] net/bnxt: tf_core: TF support flow scale query Sriharsha Basavapatna
2024-08-30 14:00 ` [PATCH 07/47] net/bnxt: tf_core: fix slice count in case of HA entry move Sriharsha Basavapatna
2024-08-30 14:00 ` [PATCH 08/47] net/bnxt: tf_core: convert priority based TCAM manager to dynamic allocation Sriharsha Basavapatna
2024-08-30 14:00 ` [PATCH 09/47] net/bnxt: tf_core: remove dead AFM code from session-based priority TCAM mgr Sriharsha Basavapatna
2024-08-30 14:00 ` [PATCH 10/47] net/bnxt: tf_core: remove dead " Sriharsha Basavapatna
2024-08-30 14:00 ` [PATCH 11/47] net/bnxt: tfc: support tf-core for Thor2 Sriharsha Basavapatna
2024-08-30 14:00 ` Sriharsha Basavapatna [this message]
2024-08-30 14:00 ` [PATCH 13/47] net/bnxt: tf_ulp: add custom l2 etype tunnel support Sriharsha Basavapatna
2024-08-30 14:00 ` [PATCH 14/47] net/bnxt: tf_ulp: add support for vf to vf flow offload Sriharsha Basavapatna
2024-08-30 14:00 ` [PATCH 15/47] net/bnxt: tf_ulp: Wh+ mirroring support Sriharsha Basavapatna
2024-08-30 14:00 ` [PATCH 16/47] net/bnxt: tf_ulp: miscellaneous fixes Sriharsha Basavapatna
2024-08-30 14:00 ` [PATCH 17/47] net/bnxt: tf_ulp: support for Thor2 ulp layer Sriharsha Basavapatna
2024-08-30 14:00 ` [PATCH 18/47] net/bnxt: tf_ulp: add support for overlapping flows Sriharsha Basavapatna
2024-08-30 14:00 ` [PATCH 19/47] net/bnxt: tf_ulp: convert recipe table to dynamic memory Sriharsha Basavapatna
2024-08-30 14:00 ` [PATCH 20/47] net/bnxt: tf_ulp: add feature bit support Sriharsha Basavapatna
2024-08-30 14:00 ` [PATCH 21/47] net/bnxt: tf_ulp: add action read and clear support Sriharsha Basavapatna
2024-08-30 14:00 ` [PATCH 22/47] net/bnxt: tf_ulp: update template files Sriharsha Basavapatna
2024-08-30 14:00 ` [PATCH 23/47] net/bnxt: tf_ulp: VFR updates for Thor 2 Sriharsha Basavapatna
2024-08-30 14:00 ` [PATCH 24/47] net/bnxt: tf_ulp: add support for tunnel flow stats Sriharsha Basavapatna
2024-08-30 14:00 ` [PATCH 25/47] net/bnxt: tf_ulp: update template files Sriharsha Basavapatna
2024-08-30 14:00 ` [PATCH 26/47] net/bnxt: tf_ulp: enable recipe id generation Sriharsha Basavapatna
2024-08-30 14:00 ` [PATCH 27/47] net/bnxt: tf_ulp: fixed parent child db counters Sriharsha Basavapatna
2024-08-30 14:00 ` [PATCH 28/47] net/bnxt: tf_ulp: modify return values to adhere to C coding standard Sriharsha Basavapatna
2024-08-30 14:00 ` [PATCH 29/47] net/bnxt: tf_ulp: update template files Sriharsha Basavapatna
2024-08-30 14:00 ` [PATCH 30/47] net/bnxt: tf_ulp: add mask defaults when mask is not specified Sriharsha Basavapatna
2024-08-30 14:00 ` [PATCH 31/47] net/bnxt: tf_ulp: add jump action support Sriharsha Basavapatna
2024-08-30 14:00 ` [PATCH 32/47] net/bnxt: tf_ulp: add support for flow priority Sriharsha Basavapatna
2024-08-30 14:00 ` [PATCH 33/47] net/bnxt: tf_ulp: support for dynamic tunnel ports Sriharsha Basavapatna
2024-08-30 14:00 ` [PATCH 34/47] net/bnxt: tf_ulp: add rte_mtr support for Thor2 Sriharsha Basavapatna
2024-08-30 14:00 ` [PATCH 35/47] net/bnxt: tf_ulp: TF support flow scale query Sriharsha Basavapatna
2024-08-30 14:00 ` [PATCH 36/47] net/bnxt: tf_ulp: add support for rss flow query to ULP Sriharsha Basavapatna
2024-08-30 14:00 ` [PATCH 37/47] net/bnxt: tf_ulp: add track type feature to tables Sriharsha Basavapatna
2024-08-30 14:00 ` [PATCH 38/47] net/bnxt: tf_ulp: inline utility functions and use likely/unlikely Sriharsha Basavapatna
2024-08-30 14:00 ` [PATCH 39/47] net/bnxt: tf_ulp: switch ulp to use rte crc32 hash Sriharsha Basavapatna
2024-08-30 14:00 ` [PATCH 40/47] net/bnxt: tf_ulp: update template files Sriharsha Basavapatna
2024-08-30 14:00 ` [PATCH 41/47] net/bnxt: tf_ulp: support a few generic template items Sriharsha Basavapatna
2024-08-30 14:00 ` [PATCH 42/47] net/bnxt: tf_ulp: TFC support flow scale query for Thor2 Sriharsha Basavapatna
2024-08-30 14:00 ` [PATCH 43/47] net/bnxt: tf_ulp: update template files Sriharsha Basavapatna
2024-08-30 14:00 ` [PATCH 44/47] net/bnxt: tf_ulp: enable support for truflow feature configuration Sriharsha Basavapatna
2024-08-30 14:00 ` [PATCH 45/47] net/bnxt: tf_ulp: support a few feature extensions Sriharsha Basavapatna
2024-08-30 14:00 ` [PATCH 46/47] net/bnxt: update template files Sriharsha Basavapatna
2024-08-30 14:00 ` [PATCH 47/47] net/bnxt: tf_ulp: add stats cache for thor2 Sriharsha Basavapatna
2024-09-25 12:02 ` [PATCH 00/47] TruFlow update for Thor2 Ajit Khaparde

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240830140049.1715230-13-sriharsha.basavapatna@broadcom.com \
    --to=sriharsha.basavapatna@broadcom.com \
    --cc=dev@dpdk.org \
    --cc=kishore.padmanabha@broadcom.com \
    --cc=stuart.schacher@broadcom.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).